Merge remote-tracking branch 'imprudence/next' into next

Unless otherwise stated, Imprudence changes accepted.  The three images seem to be the same.
Conflicts:
	.gitignore
	linden/indra/develop.py
	linden/indra/llcommon/llsdserialize_xml.cpp
	linden/indra/newview/CMakeLists.txt
		Manually combined MOAP, OTR, and WL changes from both.
	linden/indra/newview/app_settings/default_grids.xml
		Manually merged the grid collection.
		Also updated IG info.
	linden/indra/newview/hippoupdate.cpp
	linden/indra/newview/llettherebelight.cpp
		Just used the Imprudence copy.
	linden/indra/newview/llviewermessage.cpp
		Keep unbranding.
	linden/indra/newview/llvoavatar.cpp
		Manually merge client tags.
	linden/indra/newview/res/viewerRes.rc
		Manually merge version from Impy.
	linden/indra/newview/skins/dark/colors_base.xml
		Keep unbranding.
	linden/indra/newview/skins/default/html/unabletoconnect.png
	linden/indra/newview/skins/default/textures/icon_top_pick.tga
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
		Manual merging of contributors.
	linden/indra/newview/skins/gemini/colors_base.xml
		Keep unbranding.
	linden/indra/newview/skins/gemini/textures/icon_top_pick.tga
	linden/indra/newview/viewer_manifest.py
		Manually merged boost, gstreamer, OTR, and name.
	linden/indra/newview/viewerinfo.cpp
		Manually merge the comment.

1 files changed, 21 insertions, 1 deletions

diff --git a/linden/scripts/linux/config-SL-source b/linden/scripts/linux/config-SL-source
index 174d7d4..f60fd92 100644
--- a/linden/scripts/linux/config-SL-source
+++ b/linden/scripts/linux/config-SL-source
@@ -9,6 +9,9 @@
 # accordingly, so that you (should) end up with a properly packaged client.
 
 PWD=`pwd`
+os_extra=''
+ionice='ionice -c 3'
+
 
 # Where the sources of the client will be held (defaults to "./linden"):
 PATH_TO_SOURCES="$PWD/../.."
@@ -18,6 +21,8 @@ PATH_TO_PATCHES="$PWD/../../patches"
 TEMP_DIR="/tmp/SL-$USER"
 mkdir -p $TEMP_DIR
 
+TYPE="RelWithDebInfo"
+
 USE_SYSTEM_GTK="no"
 USE_SYSTEM_SDL="no"
 USE_SYSTEM_SSL="no"
@@ -53,7 +58,7 @@ USE_SYSTEM_BOOST="no"
 # You may add tune flags here, to optimize the code for your processor.
 # Example, for an Athlon XP:
 # TUNE_FLAGS="-march=athlon-xp"
-TUNE_FLAGS="-fomit-frame-pointer -frename-registers -ftree-vectorize -fweb -fexpensive-optimizations -msse -mfpmath=sse"
+TUNE_FLAGS="-O2 -fomit-frame-pointer -frename-registers -ftree-vectorize -fweb -fexpensive-optimizations -msse -mfpmath=sse"
 # Set this to "yes" to force vectorization use in the viewer code (only for
 # processors with SSE or Altivec units, and only if you did enable them via
 # the TUNE_FLAGS.
@@ -61,3 +66,18 @@ FORCE_VECTORIZE="yes"
 
 # When using gcc v4.3 or later, you might have to set this to yes...
 ALLOW_WARNINGS="yes"
+
+
+# Change it all for cygwin.
+if [ "$OSTYPE" == "cygwin" ] ; then
+    os_extra='-G nmake'
+    ionice=''
+    USE_SYSTEM_LIBSTDC="no"
+    TUNE_FLAGS="/EHsc /GR /Zm1000 /DWIN32 /D_WINDOWS "
+    FORCE_VECTORIZE="no"
+    ALLOW_WARNINGS="no"
+fi
+
+
+# Work around python problems.
+export PYTHONUNBUFFERED='True'