[SCM] A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids branch, master, updated. upstream/1.20.8-31-g8f9aa30

[Robin Cornelius]

The following commit has been merged in the master branch:
commit b4dcbbbad7ac0e9b11f62eeee9bd4aa9e039bc8b
Author: Robin Cornelius <robin.cornelius at gmail.com>
Date:   Thu Jun 26 10:36:56 2008 +0100

    Fix some lintain warnings, revert some out of patch system changes and update changelog

diff --git a/debian/changelog b/debian/changelog
index 606e9c6..957d9ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 omvviewer (1.20.10-1) experimental; urgency=low
 
   * New Upstream Version
+    + Add patches/0000_explicit_cast_for_gcc_4_1_2.dpatch
   * Fix watch file
 
- -- robin <robin.cornelius at gmail.com>  Tue, 24 Jun 2008 14:01:30 +0100
+ -- Robin Cornelius <robin.cornelius at gmail.com>  Tue, 24 Jun 2008 14:01:30 +0100
 
 omvviewer (1.20.9-1) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index d1bc720..96b28c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,6 +79,7 @@ binary-arch: build-arch install-arch
 	dh_installdocs -s
 	dh_installmenu -s
 	dh_installman -s
+	dh_desktop
 	dh_strip -s --dbg-package=omvviewer-dbg
 	dh_compress  -s
 	dh_fixperms -s
diff --git a/doc/LICENSE-source.txt b/doc/LICENSE-source.txt
deleted file mode 100644
index 200803b..0000000
--- a/doc/LICENSE-source.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Source code
-========
-The license for the source code in this distribution should be clearly
-marked on each source file.  Unless otherwise specified, the source
-code in this distribution ("Source Code") is provided by Linden Lab to
-you under the terms of the GNU General Public License, version 2.0
-("GPL"), unless you have obtained a separate licensing agreement
-("Other License"), formally executed by you and Linden Lab.  Terms of
-the GPL can be found in doc/GPL-license.txt in this distribution, or
-online at http://secondlife.com/developers/opensource/gplv2
-
-There are special exceptions to the terms and conditions of the GPL as
-it is applied to this Source Code. View the full text of the exception
-in the file doc/FLOSS-exception.txt in this software distribution, or
-online at http://secondlife.com/developers/opensource/flossexception
-
-By copying, modifying or distributing this software, you acknowledge
-that you have read and understood your obligations described above,
-and agree to abide by those obligations.
-
-ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-COMPLETENESS OR PERFORMANCE.
-
-Logos and trademarks
-==============
-
-"Second Life" and "Linden Lab" are registered trademarks of Linden
-Research, Inc.  Other trademarks include (but are not limited to): the
-names Linden and Linden Research, as well as the Linden Lab Hexagon
-Design and the Second Life Hand Design logos.
-
-Use of logos and trademarks are subject to the Linden Lab trademark
-policy, available at:
-
-http://secondlife.com/corporate/trademark/
diff --git a/doc/asset_urls.txt b/doc/asset_urls.txt
deleted file mode 100644
index 494bc0f..0000000
--- a/doc/asset_urls.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# For building instructions:
-# https://wiki.secondlife.com/wiki/Get_source_and_compile
-
-SLASSET_MD5=http://secondlife.com/developers/opensource/downloads/2008/05/md5sums-Branch_1-20-Viewer-r87649.txt
-SLASSET_ART=http://secondlife.com/developers/opensource/downloads/2008/05/slviewer-artwork-Branch_1-20-Viewer-r87649.zip
-SLASSET_LIBS_DARWIN=http://secondlife.com/developers/opensource/downloads/2008/05/slviewer-darwin-libs-Branch_1-20-Viewer-r87649.tar.gz
-SLASSET_LIBS_WIN32=http://secondlife.com/developers/opensource/downloads/2008/05/slviewer-win32-libs-Branch_1-20-Viewer-r87649.zip
-SLASSET_LIBS_LINUXI386=http://secondlife.com/developers/opensource/downloads/2008/05/slviewer-linux-libs-Branch_1-20-Viewer-r87649.tar.gz
diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp
index 7c46114..58cf200 100644
--- a/indra/llui/llstyle.cpp
+++ b/indra/llui/llstyle.cpp
@@ -102,7 +102,7 @@ LLStyle &LLStyle::operator=(const LLStyle &rhs)
 		mItalic = rhs.mItalic;
 		mBold = rhs.mBold;
 		mUnderline = rhs.mUnderline;
-		mDropShadow = rhs.mUnderline;
+		mDropShadow = rhs.mDropShadow;
 		mIsEmbeddedItem = rhs.mIsEmbeddedItem;
 	}
 	

-- 
A client for connecting to 3D metaverses such as Linden Labs Secondlife(tm) and OpenSim grids