From 29a28522e200d4f6bc393e0cc7ed76584687de09 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 31 Jul 2010 04:13:28 -0500
Subject: Fixed a Linden typo that made the object cache useless. (SNOW-783)

---
 linden/indra/newview/llviewerregion.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 69405d2..4257f70 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -374,7 +374,7 @@ void LLViewerRegion::saveCache()
 
 	std::string filename;
 	filename = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"") + gDirUtilp->getDirDelimiter() +
-		llformat("sobjects_%d_%d.slc", U32(mHandle>>32)/REGION_WIDTH_UNITS, U32(mHandle)/REGION_WIDTH_UNITS );
+		llformat("objects_%d_%d.slc", U32(mHandle>>32)/REGION_WIDTH_UNITS, U32(mHandle)/REGION_WIDTH_UNITS );
 
 	LLFILE* fp = LLFile::fopen(filename, "wb");		/* Flawfinder: ignore */
 	if (!fp)
-- 
cgit v1.1


From e4475e45edde706332718908b1ebbef924c44b4f Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 27 Jul 2010 04:08:19 -0500
Subject: Refactored a bunch of messy LightShare code.

---
 linden/indra/newview/CMakeLists.txt             |   2 +
 linden/indra/newview/lightshare.cpp             | 302 ++++++++++++++++++++++++
 linden/indra/newview/lightshare.h               |  67 ++++++
 linden/indra/newview/llviewergenericmessage.cpp | 110 +--------
 linden/indra/newview/llwindlightremotectrl.cpp  |   3 +-
 linden/indra/newview/meta7windlight.h           |  35 +++
 6 files changed, 416 insertions(+), 103 deletions(-)
 create mode 100644 linden/indra/newview/lightshare.cpp
 create mode 100644 linden/indra/newview/lightshare.h

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index a5f2cbb..7077dde 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -76,6 +76,7 @@ set(viewer_SOURCE_FILES
     hippoRestRequest.cpp
     jcfloater_animation_list.cpp
     jcfloaterareasearch.cpp
+    lightshare.cpp
     llagent.cpp
     llagentaccess.cpp
     llagentdata.cpp
@@ -507,6 +508,7 @@ set(viewer_HEADER_FILES
     hippoRestRequest.h
     jcfloater_animation_list.h
     jcfloaterareasearch.h
+    lightshare.h
     llagent.h
     llagentaccess.h
     llagentdata.h
diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
new file mode 100644
index 0000000..24d4139
--- /dev/null
+++ b/linden/indra/newview/lightshare.cpp
@@ -0,0 +1,302 @@
+/**
+ * @file lightshare.cpp
+ * @brief Handler for Meta7 Lightshare (region-side Windlight settings).
+ *
+ * Copyright (c) 2010, Tom Meta / Meta7
+ * Copyright (c) 2010, Jacek Antonelli
+ *
+ * The source code in this file ("Source Code") is provided to you
+ * under the terms of the GNU General Public License, version 2.0
+ * ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+ * this distribution, or online at
+ * http://secondlifegrid.net/programs/open_source/licensing/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://secondlifegrid.net/programs/open_source/licensing/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 SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+
+#include "lightshare.h"
+
+#include "linden_common.h"
+
+#include "lluuid.h"
+#include "llviewercontrol.h"
+#include "llwaterparammanager.h"
+#include "llwaterparamset.h"
+#include "llwlparammanager.h"
+#include "llwlparamset.h"
+#include "message.h"
+#include "meta7windlight.h"
+
+
+// The names of the presets where the region settings are stored.
+const std::string WindlightMessage::sWaterPresetName = "(Region settings)";
+const std::string WindlightMessage::sSkyPresetName   = "(Region settings)";
+
+
+WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
+	mPacket(NULL),
+	mWater(NULL),
+	mSky(NULL),
+	mWaterNormal(NULL),
+	mIsValid(false)
+{
+	std::string method;
+	msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, method);
+
+	if( method != "Windlight" )
+	{
+		return; // Wrong message type, somehow.
+	}
+
+	S32 size = msg->getSizeFast(_PREHASH_ParamList, 0,
+															_PREHASH_Parameter);
+
+	if( size < 0 || 250 < size )
+	{
+		return; // Too small or too big.
+	}
+
+	// Unpack and process the message's binary payload.
+	char buf[250];
+	msg->getBinaryDataFast(_PREHASH_ParamList,
+												 _PREHASH_Parameter,
+												 buf, size, 0, 249);
+
+	mWater = new LLWaterParamSet();
+	mSky = new LLWLParamSet();
+	mWaterNormal = LLUUID();
+
+	process_packet(&buf[0]);
+	process_water();
+	process_sky();
+
+	// *TODO: Actually validate the settings.
+	mIsValid = true;
+}
+
+
+WindlightMessage::~WindlightMessage()
+{
+	delete mWater;
+	delete mSky;
+}
+
+
+// static
+void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
+{
+	if( gSavedSettings.getBOOL("UseServersideWindlightSettings") )
+	{
+		WindlightMessage wl = WindlightMessage(msg);
+		if( wl.isValid() )
+		{
+			wl.apply();
+		}
+	}
+}
+
+
+bool WindlightMessage::apply()
+{
+	LLWaterParamManager* water_mgr = LLWaterParamManager::instance();
+	LLWLParamManager* sky_mgr = LLWLParamManager::instance();
+
+	mWater->mName = sWaterPresetName;
+	water_mgr->removeParamSet( sWaterPresetName, false );
+	water_mgr->addParamSet( sWaterPresetName, *mWater );
+	water_mgr->savePreset( sWaterPresetName );
+	water_mgr->loadPreset( sWaterPresetName, true );
+	water_mgr->setNormalMapID( mWaterNormal );
+
+	mSky->mName = sSkyPresetName;
+	sky_mgr->mAnimator.mIsRunning = false;
+	sky_mgr->mAnimator.mUseLindenTime = false;
+	sky_mgr->removeParamSet( sSkyPresetName, false );
+	sky_mgr->addParamSet( sSkyPresetName, *mSky );
+	sky_mgr->savePreset( sSkyPresetName );
+	sky_mgr->loadPreset( sSkyPresetName, true );
+
+	return true;
+}
+
+
+bool WindlightMessage::isValid()
+{
+	return mIsValid;
+}
+
+
+void WindlightMessage::process_packet( char* buf )
+{
+	// *FIXME: Horrible idea, fragile, not byte-order or endian
+	//         safe, no validation, etc. etc. -Jacek
+	mPacket = (Meta7WindlightPacket*)buf;
+}
+
+
+void WindlightMessage::process_water()
+{
+	mWater->set("waterFogColor",
+							mPacket->waterColor.red   / 256.f,
+							mPacket->waterColor.green / 256.f,
+							mPacket->waterColor.blue  / 256.f);
+
+	mWater->set("waterFogDensity",
+							pow(2.0f, mPacket->waterFogDensityExponent));
+
+	mWater->set("underWaterFogMod", mPacket->underwaterFogModifier);
+
+	mWater->set("normScale",
+							mPacket->reflectionWaveletScale.X,
+							mPacket->reflectionWaveletScale.Y,
+							mPacket->reflectionWaveletScale.Z);
+
+	mWater->set("fresnelScale",   mPacket->fresnelScale);
+	mWater->set("fresnelOffset",  mPacket->fresnelOffset);
+	mWater->set("scaleAbove",     mPacket->refractScaleAbove);
+	mWater->set("scaleBelow",     mPacket->refractScaleBelow);
+	mWater->set("blurMultiplier", mPacket->blurMultiplier);
+
+	mWater->set("wave1Dir",
+							mPacket->littleWaveDirection.X,
+							mPacket->littleWaveDirection.Y);
+
+	mWater->set("wave2Dir",
+							mPacket->bigWaveDirection.X,
+							mPacket->bigWaveDirection.Y);
+
+
+	// Format a UUID string from a block of raw bytes. Ugh.
+	std::string uuid = llformat(
+		"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+		(U8)(mPacket->normalMapTexture[0]),
+		(U8)(mPacket->normalMapTexture[1]),
+		(U8)(mPacket->normalMapTexture[2]),
+		(U8)(mPacket->normalMapTexture[3]),
+		(U8)(mPacket->normalMapTexture[4]),
+		(U8)(mPacket->normalMapTexture[5]),
+		(U8)(mPacket->normalMapTexture[6]),
+		(U8)(mPacket->normalMapTexture[7]),
+		(U8)(mPacket->normalMapTexture[8]),
+		(U8)(mPacket->normalMapTexture[9]),
+		(U8)(mPacket->normalMapTexture[10]),
+		(U8)(mPacket->normalMapTexture[11]),
+		(U8)(mPacket->normalMapTexture[12]),
+		(U8)(mPacket->normalMapTexture[13]),
+		(U8)(mPacket->normalMapTexture[14]),
+		(U8)(mPacket->normalMapTexture[15]));
+
+	mWaterNormal.set(uuid);
+}
+
+
+void WindlightMessage::process_sky()
+{
+	mSky->setSunAngle(F_TWO_PI * mPacket->sunMoonPosiiton);
+	mSky->setEastAngle(F_TWO_PI * mPacket->eastAngle);
+
+	mSky->set("sunlight_color",
+						mPacket->sunMoonColor.red * 3.0f,
+						mPacket->sunMoonColor.green * 3.0f,
+						mPacket->sunMoonColor.blue * 3.0f,
+						mPacket->sunMoonColor.alpha * 3.0f);
+
+	mSky->set("ambient",
+						mPacket->ambient.red * 3.0f,
+						mPacket->ambient.green * 3.0f,
+						mPacket->ambient.blue * 3.0f,
+						mPacket->ambient.alpha * 3.0f);
+
+	mSky->set("blue_horizon",
+						mPacket->horizon.red * 2.0f,
+						mPacket->horizon.green *2.0f,
+						mPacket->horizon.blue * 2.0f,
+						mPacket->horizon.alpha * 2.0f);
+
+	mSky->set("blue_density",
+						mPacket->blueDensity.red * 2.0f,
+						mPacket->blueDensity.green * 2.0f,
+						mPacket->blueDensity.blue * 2.0f,
+						mPacket->blueDensity.alpha * 2.0f);
+
+	mSky->set("haze_horizon",
+						mPacket->hazeHorizon,
+						mPacket->hazeHorizon,
+						mPacket->hazeHorizon,
+						1.f);
+
+	mSky->set("haze_density",
+						mPacket->hazeDensity,
+						0.f, 0.f, 1.f);
+
+	mSky->set("cloud_shadow",
+						mPacket->cloudCoverage,
+						0.f, 0.f, 1.f);
+
+	mSky->set("density_multiplier",
+	          mPacket->densityMultiplier / 1000.0f,
+	          0.f, 0.f, 1.f);
+
+	mSky->set("distance_multiplier",
+						mPacket->distanceMultiplier,
+						0.f, 0.f, 1.f);
+
+	mSky->set("max_y",
+	          (F32)mPacket->maxAltitude,
+	          0.f, 0.f, 1.f);
+
+	mSky->set("cloud_color",
+						mPacket->cloudColor.red,
+						mPacket->cloudColor.green,
+						mPacket->cloudColor.blue,
+						mPacket->cloudColor.alpha);
+
+	mSky->set("cloud_pos_density1",
+						mPacket->cloudXYDensity.X,
+						mPacket->cloudXYDensity.Y,
+	          mPacket->cloudXYDensity.Z,
+	          1.f);
+
+	mSky->set("cloud_pos_density2",
+						mPacket->cloudDetailXYDensity.X,
+						mPacket->cloudDetailXYDensity.Y,
+						mPacket->cloudDetailXYDensity.Z,
+	          1.f);
+
+	mSky->set("cloud_scale",
+	          mPacket->cloudScale,
+	          0.f, 0.f, 1.f);
+
+	mSky->set("gamma",
+						mPacket->sceneGamma,
+						0.f, 0.f, 1.f);
+
+	mSky->set("glow",
+						(2 - mPacket->sunGlowSize) * 20,
+						0.f,
+	          -mPacket->sunGlowFocus * 5,
+	          1.f);
+
+	mSky->setCloudScrollX(mPacket->cloudScrollX + 10.0f);
+	mSky->setCloudScrollY(mPacket->cloudScrollY + 10.0f);
+
+	mSky->setEnableCloudScrollX(!mPacket->cloudScrollXLock);
+	mSky->setEnableCloudScrollY(!mPacket->cloudScrollYLock);
+
+	mSky->setStarBrightness(mPacket->starBrightness);
+}
+
+
diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/lightshare.h
new file mode 100644
index 0000000..a76cd1b
--- /dev/null
+++ b/linden/indra/newview/lightshare.h
@@ -0,0 +1,67 @@
+/**
+ * @file lightshare.h
+ * @brief Public interface for lightshare.cpp
+ *
+ * Copyright (c) 2010, Jacek Antonelli
+ *
+ * The source code in this file ("Source Code") is provided to you
+ * under the terms of the GNU General Public License, version 2.0
+ * ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+ * this distribution, or online at
+ * http://secondlifegrid.net/programs/open_source/licensing/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://secondlifegrid.net/programs/open_source/licensing/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 SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+
+#ifndef LIGHTSHARE_H
+#define LIGHTSHARE_H
+
+#include "message.h"
+#include "meta7windlight.h"
+#include "llwaterparamset.h"
+#include "llwlparamset.h"
+
+
+// Encapsulates a "Windlight" (LightShare) message sent from the
+// server, allowing the settings to be applied at a later time.
+//
+class WindlightMessage
+{
+	public:
+
+	static const std::string sWaterPresetName;
+	static const std::string sSkyPresetName;
+
+	WindlightMessage( LLMessageSystem* msg );
+	~WindlightMessage();
+	static void processWindlight(LLMessageSystem* msg, void**);
+	bool apply();
+	bool isValid();
+
+	private:
+
+	Meta7WindlightPacket* mPacket;
+	LLWaterParamSet* mWater;
+	LLWLParamSet* mSky;
+	LLUUID mWaterNormal;
+	bool mIsValid;
+
+	void process_packet( char* buf );
+	void process_water();
+	void process_sky();
+};
+
+#endif
diff --git a/linden/indra/newview/llviewergenericmessage.cpp b/linden/indra/newview/llviewergenericmessage.cpp
index c9954b3..8078888 100644
--- a/linden/indra/newview/llviewergenericmessage.cpp
+++ b/linden/indra/newview/llviewergenericmessage.cpp
@@ -32,18 +32,15 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-
 #include "llviewergenericmessage.h"
-#include "meta7windlight.h"
+
 #include "lldispatcher.h"
 #include "lluuid.h"
 #include "message.h"
 #include "llagent.h"
-#include "llwaterparamset.h"
-#include "llwaterparammanager.h"
-#include "llwlparamset.h"
-#include "llwlparammanager.h"
 #include "lluuid.h"
+#include "lightshare.h"
+
 
 LLDispatcher gGenericDispatcher;
 
@@ -88,109 +85,20 @@ void process_generic_message(LLMessageSystem* msg, void**)
 	std::string method;
 	msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, method);
 	
-	//This needs to be handled by a dispatcher really, but I'm not sure where is the best place to put it
-	if (method == "Windlight" && gSavedSettings.getBOOL("UseServersideWindlightSettings"))
+	// TODO: Use a proper dispatcher.
+	if(method == "Windlight")
 	{	
-		//Meta7 WindLight packet
-		//We are delivering with an agentID of NULL_KEY so as to be
-		//friendly and not trigger a warning for unsupporting clients.
-		S32 count = msg->getNumberOfBlocksFast(_PREHASH_ParamList);
-		for (S32 i = 0; i < count; ++i)
-		{
-			// our param is binary data)
-			S32 size = msg->getSizeFast(_PREHASH_ParamList, i, _PREHASH_Parameter);
-			if (size >= 0)
-			{
-				char buf[250];
-				msg->getBinaryDataFast(
-					_PREHASH_ParamList, _PREHASH_Parameter,
-					buf, size, i, 249);
-				
-				Meta7WindlightPacket* wl = (Meta7WindlightPacket*)buf;
-			
-				LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
-				LLWaterParamSet & param_set = param_mgr->mCurParams;
-
-				param_set.set("waterFogColor", wl->waterColor.red / 256.f, wl->waterColor.green / 256.f, wl->waterColor.blue / 256.f);
-				param_set.set("waterFogDensity", pow(2.0f, wl->waterFogDensityExponent));
-				param_set.set("underWaterFogMod", wl->underwaterFogModifier);
-				param_set.set("normScale", wl->reflectionWaveletScale.X,wl->reflectionWaveletScale.Y,wl->reflectionWaveletScale.Z);
-				param_set.set("fresnelScale", wl->fresnelScale);
-				param_set.set("fresnelOffset", wl->fresnelOffset);
-				param_set.set("scaleAbove", wl->refractScaleAbove);
-				param_set.set("scaleBelow", wl->refractScaleBelow);
-				param_set.set("blurMultiplier", wl->blurMultiplier);
-				param_set.set("wave1Dir", wl->littleWaveDirection.X, wl->littleWaveDirection.Y);
-				param_set.set("wave2Dir", wl->bigWaveDirection.X, wl->bigWaveDirection.Y);
-
-				LLUUID normalMapTexture;
-
-				std::string out = llformat(
-					"%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-					(U8)(wl->normalMapTexture[0]),
-					(U8)(wl->normalMapTexture[1]),
-					(U8)(wl->normalMapTexture[2]),
-					(U8)(wl->normalMapTexture[3]),
-					(U8)(wl->normalMapTexture[4]),
-					(U8)(wl->normalMapTexture[5]),
-					(U8)(wl->normalMapTexture[6]),
-					(U8)(wl->normalMapTexture[7]),
-					(U8)(wl->normalMapTexture[8]),
-					(U8)(wl->normalMapTexture[9]),
-					(U8)(wl->normalMapTexture[10]),
-					(U8)(wl->normalMapTexture[11]),
-					(U8)(wl->normalMapTexture[12]),
-					(U8)(wl->normalMapTexture[13]),
-					(U8)(wl->normalMapTexture[14]),
-					(U8)(wl->normalMapTexture[15]));
-
-				normalMapTexture.set(out);
-
-				param_mgr->setParamSet(	"Meta7CurrentRegion", param_set);
-				param_mgr->setNormalMapID(normalMapTexture);
-
-				LLWLParamManager * wl_param_mgr = LLWLParamManager::instance();
-				LLWLParamSet & wl_param_set = wl_param_mgr->mCurParams;
-				wl_param_set.setSunAngle(F_TWO_PI * wl->sunMoonPosiiton);
-				wl_param_set.setEastAngle(F_TWO_PI * wl->eastAngle);
-				wl_param_set.set("sunlight_color", wl->sunMoonColor.red * 3.0f, wl->sunMoonColor.green * 3.0f, wl->sunMoonColor.blue * 3.0f, wl->sunMoonColor.alpha * 3.0f);
-				wl_param_set.set("ambient", wl->ambient.red * 3.0f, wl->ambient.green * 3.0f, wl->ambient.blue * 3.0f, wl->ambient.alpha * 3.0f);
-				wl_param_set.set("blue_horizon", wl->horizon.red * 2.0f, wl->horizon.green *2.0f, wl->horizon.blue * 2.0f, wl->horizon.alpha * 2.0f);
-				wl_param_set.set("blue_density", wl->blueDensity.red * 2.0f, wl->blueDensity.green * 2.0f, wl->blueDensity.blue * 2.0f, wl->blueDensity.alpha * 2.0f);
-				wl_param_set.set("haze_horizon", wl->hazeHorizon, wl->hazeHorizon, wl->hazeHorizon, 1.f);
-				wl_param_set.set("haze_density", wl->hazeDensity, wl->hazeDensity, wl->hazeDensity, 1.f);
-				wl_param_set.set("cloud_shadow", wl->cloudCoverage, wl->cloudCoverage, wl->cloudCoverage, wl->cloudCoverage);
-				wl_param_set.set("density_multiplier", wl->densityMultiplier / 1000.0f);
-				wl_param_set.set("distance_multiplier", wl->distanceMultiplier, wl->distanceMultiplier, wl->distanceMultiplier, wl->distanceMultiplier);
-				wl_param_set.set("max_y",(F32)wl->maxAltitude);
-				wl_param_set.set("cloud_color", wl->cloudColor.red, wl->cloudColor.green, wl->cloudColor.blue, wl->cloudColor.alpha);
-				wl_param_set.set("cloud_pos_density1", wl->cloudXYDensity.X, wl->cloudXYDensity.Y, wl->cloudXYDensity.Z);
-				wl_param_set.set("cloud_pos_density2", wl->cloudDetailXYDensity.X, wl->cloudDetailXYDensity.Y, wl->cloudDetailXYDensity.Z);
-				wl_param_set.set("cloud_scale", wl->cloudScale, 0.f, 0.f, 1.f);
-				wl_param_set.set("gamma", wl->sceneGamma, wl->sceneGamma, wl->sceneGamma, 0.0f);
-				wl_param_set.set("glow",(2 - wl->sunGlowSize) * 20 , 0.f, -wl->sunGlowFocus * 5);
-				wl_param_set.setCloudScrollX(wl->cloudScrollX + 10.0f);
-				wl_param_set.setCloudScrollY(wl->cloudScrollY + 10.0f);
-				wl_param_set.setEnableCloudScrollX(!wl->cloudScrollXLock);
-				wl_param_set.setEnableCloudScrollY(!wl->cloudScrollYLock);
-				wl_param_set.setStarBrightness(wl->starBrightness);
-				wl_param_mgr->removeParamSet("Meta7-CurrentRegion",true);
-				wl_param_mgr->addParamSet(	"Meta7-CurrentRegion", wl_param_set);
-				wl_param_mgr->savePreset( "Meta7-CurrentRegion");
-				LLWLParamManager::instance()->mAnimator.mIsRunning = false;
-				LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
-				wl_param_mgr->loadPreset( "Meta7-CurrentRegion",true);	
-			}
-		}
+		WindlightMessage::processWindlight(msg, NULL);
+		return;
 	}
-	else if (agent_id != gAgent.getID())
+
+	if( agent_id != gAgent.getID() )
 	{
 		llwarns << "GenericMessage for wrong agent" << llendl;
 		return;
 	}
 	else
 	{
-
 		std::string request;
 		LLUUID invoice;
 		LLDispatcher::sparam_t strings;
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index 0beb3e5..b5c15a5 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -173,8 +173,7 @@ void LLWindlightRemoteCtrl::refreshPresets()
 		mPresetsCombo->addSimpleElement(getString("midnight"), ADD_BOTTOM);
 		mPresetsCombo->addSimpleElement(getString("revert_region"), ADD_BOTTOM);
 
-		if (mPresetsCombo->getSelectedItemLabel() != currentParams.mName &&
-			!currentParams.mName.empty())
+		if (!currentParams.mName.empty())
 		{
 			mPresetsCombo->selectByValue(LLSD(currentParams.mName));
 		}
diff --git a/linden/indra/newview/meta7windlight.h b/linden/indra/newview/meta7windlight.h
index 9927558..04ce86d 100644
--- a/linden/indra/newview/meta7windlight.h
+++ b/linden/indra/newview/meta7windlight.h
@@ -1,3 +1,36 @@
+/**
+ * @file lightshare.cpp
+ * @brief Handler for Meta7 Lightshare (region-side Windlight settings).
+ *
+ * Copyright (c) 2010, Tom Meta / Meta7 Project
+ *
+ * The source code in this file ("Source Code") is provided to you
+ * under the terms of the GNU General Public License, version 2.0
+ * ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
+ * this distribution, or online at
+ * http://secondlifegrid.net/programs/open_source/licensing/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://secondlifegrid.net/programs/open_source/licensing/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 SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ */
+
+
+#ifndef META7WINDLIGHT_H
+#define META7WINDLIGHT_H
+
+#include "linden_common.h"
+
 struct M7Color3{
 	M7Color3(){};
 	M7Color3(F32 pRed, F32 pGreen, F32 pBlue)
@@ -94,3 +127,5 @@ struct Meta7WindlightPacket {
 	
 
 };
+
+#endif
-- 
cgit v1.1


From 3b8cfc9fbbb8ede46b9bd34b0ad1c59a8d047e9e Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Wed, 28 Jul 2010 04:02:47 -0500
Subject: Added confirmation dialog before applying LightShare settings.

If you are using a preset other than the default preset or
the LightShare preset, the viewer will now ask you whether
to apply settings received from the server.
---
 linden/indra/newview/lightshare.cpp                | 37 ++++++++++++++++++++--
 linden/indra/newview/lightshare.h                  |  4 +++
 .../skins/default/xui/en-us/notifications.xml      | 19 +++++++++++
 3 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index 24d4139..aa5443b 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -100,14 +100,45 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 {
 	if( gSavedSettings.getBOOL("UseServersideWindlightSettings") )
 	{
-		WindlightMessage wl = WindlightMessage(msg);
-		if( wl.isValid() )
+		WindlightMessage* wl = new WindlightMessage(msg);
+		if( wl->isValid() )
 		{
-			wl.apply();
+			std::string water = LLWaterParamManager::instance()->mCurParams.mName;
+			std::string sky = LLWLParamManager::instance()->mCurParams.mName;
+
+			// If they are using the default or region settings, just apply
+			// the new settings, don't bother asking.
+			if((sky == "Default" || sky == sSkyPresetName) &&
+			   (water == "Default" || water == sWaterPresetName))
+			{
+				wl->apply();
+				delete wl;
+			}
+			else
+			{
+				LLNotifications::instance()
+					.add("ConfirmLightShare",
+					     LLSD(), LLSD(), 
+					     boost::bind(&applyCallback, _1, _2, wl));
+			}
 		}
 	}
 }
 
+// static
+bool WindlightMessage::applyCallback(const LLSD& notification,
+                                     const LLSD& response,
+                                     WindlightMessage* wl)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	if( option == 0 )
+	{
+		wl->apply();
+	}
+	delete wl;
+	return false;
+}
+
 
 bool WindlightMessage::apply()
 {
diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/lightshare.h
index a76cd1b..2bf95c6 100644
--- a/linden/indra/newview/lightshare.h
+++ b/linden/indra/newview/lightshare.h
@@ -48,6 +48,10 @@ class WindlightMessage
 	WindlightMessage( LLMessageSystem* msg );
 	~WindlightMessage();
 	static void processWindlight(LLMessageSystem* msg, void**);
+	static bool applyCallback(const LLSD& notification,
+	                          const LLSD& response,
+	                          WindlightMessage* wl);
+
 	bool apply();
 	bool isValid();
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 975f10b..2a0af02 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6992,6 +6992,25 @@ Shadows cannot be enabled due to your graphics settings being set too low. Make
 Note: To comply with the Second Life Terms of Service, Imprudence did not download any texture files for the exported object(s).
 </notification>
 
+<notification
+ name="ConfirmLightShare"
+ type="notify"
+ icon="notify.tga">
+This region has custom sky and water settings.
+
+Apply region settings now?
+  <form name="form">
+    <button
+     index="0"
+     name="Apply"
+     text="Apply"/>
+    <button
+     index="2"
+     name="Ignore"
+     text="Ignore"/>
+  </form>
+</notification>
+
 
 <!--End Imprudence notifications-->
 
-- 
cgit v1.1


From fc0899df14e13eb7b20cf37b2c1f37a7412b5475 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 29 Jul 2010 00:48:07 -0500
Subject: No longer reset Windlight settings after teleport.

It was part of the LightShare changes, but it annoys people.
---
 linden/indra/newview/llviewermessage.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index ecbe0ef..353fd9f 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -138,8 +138,6 @@
 #include "llviewerdisplay.h"
 #include "llkeythrottle.h"
 
-#include "llwlparammanager.h"
-#include "llwaterparammanager.h"
 #include "panelradarentry.h"
 
 #include <boost/tokenizer.hpp>
@@ -3224,10 +3222,6 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 	gCacheName->setUpstream(sim);
 */
 
-	// Reset windlight settings to default
-	LLWLParamManager::instance()->mAnimator.mIsRunning = true;
-	LLWLParamManager::instance()->mAnimator.mUseLindenTime = true;
-
 	// now, use the circuit info to tell simulator about us!
 	LL_INFOS("Messaging") << "process_teleport_finish() Enabling "
 			<< sim_host << " with code " << msg->mOurCircuitCode << LL_ENDL;
-- 
cgit v1.1


From 8314920310fa11d5974d733da6817176f7cc9b93 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 29 Jul 2010 04:13:45 -0500
Subject: Don't spam user with ConfirmLightShare notifications.

Now only one notification is created, but the class remembers
the most recent settings and discards the old ones.
---
 linden/indra/newview/lightshare.cpp | 33 +++++++++++++++++++++++++--------
 linden/indra/newview/lightshare.h   |  5 +++--
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index aa5443b..c9f34ee 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -45,6 +45,8 @@
 const std::string WindlightMessage::sWaterPresetName = "(Region settings)";
 const std::string WindlightMessage::sSkyPresetName   = "(Region settings)";
 
+WindlightMessage* WindlightMessage::sMostRecent = NULL;
+
 
 WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
 	mPacket(NULL),
@@ -116,10 +118,23 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 			}
 			else
 			{
-				LLNotifications::instance()
-					.add("ConfirmLightShare",
-					     LLSD(), LLSD(), 
-					     boost::bind(&applyCallback, _1, _2, wl));
+				if( sMostRecent == NULL )
+				{
+					// No most recent, so store this and create notification
+					// asking the user whether to apply or not.
+					sMostRecent = wl;
+					LLNotifications::instance()
+						.add("ConfirmLightShare",
+								 LLSD(), LLSD(), 
+								 boost::bind(&applyCallback, _1, _2));
+				}
+				else
+				{
+					// No new notification (to avoid spamming the user), just
+					// store this as most recent.
+					delete sMostRecent;
+					sMostRecent = wl;
+				}
 			}
 		}
 	}
@@ -127,15 +142,17 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 
 // static
 bool WindlightMessage::applyCallback(const LLSD& notification,
-                                     const LLSD& response,
-                                     WindlightMessage* wl)
+                                     const LLSD& response)
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
 	if( option == 0 )
 	{
-		wl->apply();
+		sMostRecent->apply();
 	}
-	delete wl;
+
+	delete sMostRecent;
+	sMostRecent = NULL;
+
 	return false;
 }
 
diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/lightshare.h
index 2bf95c6..cbc03ad 100644
--- a/linden/indra/newview/lightshare.h
+++ b/linden/indra/newview/lightshare.h
@@ -49,14 +49,15 @@ class WindlightMessage
 	~WindlightMessage();
 	static void processWindlight(LLMessageSystem* msg, void**);
 	static bool applyCallback(const LLSD& notification,
-	                          const LLSD& response,
-	                          WindlightMessage* wl);
+	                          const LLSD& response);
 
 	bool apply();
 	bool isValid();
 
 	private:
 
+	static WindlightMessage* sMostRecent;
+
 	Meta7WindlightPacket* mPacket;
 	LLWaterParamSet* mWater;
 	LLWLParamSet* mSky;
-- 
cgit v1.1


From c80bc0e259ddf4afe6e8811684ffb505edf6d2a8 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 29 Jul 2010 21:01:21 -0500
Subject: Added a timer after ignoring LightShare settings.

If you ignore a LightShare setting, all settings for the next
30 seconds will be ignored. The timer resets each time a new
message is ignored. Customize with LightShareIgnoreTimer
in Debug Settings.
---
 linden/indra/newview/app_settings/settings.xml | 11 +++++++++
 linden/indra/newview/lightshare.cpp            | 31 +++++++++++++++++++++++++-
 linden/indra/newview/lightshare.h              |  7 ++++++
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index a59fac6..e2871ad 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -310,6 +310,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>LightShareIgnoreTimer</key>
+  <map>
+    <key>Comment</key>
+    <string>After ignoring a region Windlight settings message, new messages are ignored for this many seconds. The timer starts again each time a message is ignored.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <integer>30</integer>
+  </map>  
   <key>MapShowAgentCount</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index c9f34ee..29eab07 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -45,7 +45,9 @@
 const std::string WindlightMessage::sWaterPresetName = "(Region settings)";
 const std::string WindlightMessage::sSkyPresetName   = "(Region settings)";
 
+
 WindlightMessage* WindlightMessage::sMostRecent = NULL;
+LLTimer* WindlightMessage::sIgnoreTimer = new LLTimer();
 
 
 WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
@@ -116,6 +118,13 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 				wl->apply();
 				delete wl;
 			}
+			else if( !ignoreTimerHasExpired() )
+			{
+				// The user recently ignored a windlight message, so ignore
+				// this one too, and reset the timer.
+				resetIgnoreTimer();
+				delete wl;
+			}
 			else
 			{
 				if( sMostRecent == NULL )
@@ -145,10 +154,15 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
                                      const LLSD& response)
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
-	if( option == 0 )
+
+	if( option == 0 ) // "Apply"
 	{
 		sMostRecent->apply();
 	}
+	else if( option == 2 ) // "Ignore"
+	{
+		resetIgnoreTimer();
+	}
 
 	delete sMostRecent;
 	sMostRecent = NULL;
@@ -157,6 +171,21 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
 }
 
 
+// static
+void WindlightMessage::resetIgnoreTimer()
+{
+	F32 time = gSavedSettings.getF32("LightShareIgnoreTimer");
+	sIgnoreTimer->start();
+	sIgnoreTimer->setTimerExpirySec( (time < 0) ? 0 : time );
+}
+
+// static
+bool WindlightMessage::ignoreTimerHasExpired()
+{
+	return sIgnoreTimer->hasExpired();
+}
+
+
 bool WindlightMessage::apply()
 {
 	LLWaterParamManager* water_mgr = LLWaterParamManager::instance();
diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/lightshare.h
index cbc03ad..5b24ae3 100644
--- a/linden/indra/newview/lightshare.h
+++ b/linden/indra/newview/lightshare.h
@@ -31,6 +31,7 @@
 
 #include "message.h"
 #include "meta7windlight.h"
+#include "lltimer.h"
 #include "llwaterparamset.h"
 #include "llwlparamset.h"
 
@@ -54,9 +55,15 @@ class WindlightMessage
 	bool apply();
 	bool isValid();
 
+	protected:
+
+	static void resetIgnoreTimer();
+	static bool ignoreTimerHasExpired();
+
 	private:
 
 	static WindlightMessage* sMostRecent;
+	static LLTimer* sIgnoreTimer;
 
 	Meta7WindlightPacket* mPacket;
 	LLWaterParamSet* mWater;
-- 
cgit v1.1


From b32e8140d4126d6fa302947aab2ef0c8ae06fc38 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 30 Jul 2010 00:33:04 -0500
Subject: Restructured WindlightMessage::processWindlight().

---
 linden/indra/newview/lightshare.cpp | 91 +++++++++++++++++++------------------
 1 file changed, 48 insertions(+), 43 deletions(-)

diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index 29eab07..e7c3410 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -102,53 +102,58 @@ WindlightMessage::~WindlightMessage()
 // static
 void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 {
-	if( gSavedSettings.getBOOL("UseServersideWindlightSettings") )
+	if( !gSavedSettings.getBOOL("UseServersideWindlightSettings") )
+		return;
+
+	WindlightMessage* wl = new WindlightMessage(msg);
+
+	if( !wl->isValid() )
+		return;
+
+	std::string water = LLWaterParamManager::instance()->mCurParams.mName;
+	std::string sky = LLWLParamManager::instance()->mCurParams.mName;
+
+	// If they are using the default or region settings, just apply
+	// the new settings, don't bother asking.
+	if( (sky == "Default" || sky == sSkyPresetName) &&
+	    (water == "Default" || water == sWaterPresetName) )
+	{
+		wl->apply();
+		delete wl;
+		return;
+	}
+
+	if( !ignoreTimerHasExpired() )
 	{
-		WindlightMessage* wl = new WindlightMessage(msg);
-		if( wl->isValid() )
-		{
-			std::string water = LLWaterParamManager::instance()->mCurParams.mName;
-			std::string sky = LLWLParamManager::instance()->mCurParams.mName;
-
-			// If they are using the default or region settings, just apply
-			// the new settings, don't bother asking.
-			if((sky == "Default" || sky == sSkyPresetName) &&
-			   (water == "Default" || water == sWaterPresetName))
-			{
-				wl->apply();
-				delete wl;
-			}
-			else if( !ignoreTimerHasExpired() )
-			{
-				// The user recently ignored a windlight message, so ignore
-				// this one too, and reset the timer.
-				resetIgnoreTimer();
-				delete wl;
-			}
-			else
-			{
-				if( sMostRecent == NULL )
-				{
-					// No most recent, so store this and create notification
-					// asking the user whether to apply or not.
-					sMostRecent = wl;
-					LLNotifications::instance()
-						.add("ConfirmLightShare",
-								 LLSD(), LLSD(), 
-								 boost::bind(&applyCallback, _1, _2));
-				}
-				else
-				{
-					// No new notification (to avoid spamming the user), just
-					// store this as most recent.
-					delete sMostRecent;
-					sMostRecent = wl;
-				}
-			}
-		}
+		// The user recently ignored a windlight message, so ignore
+		// this one too, and reset the timer.
+		resetIgnoreTimer();
+		delete wl;
+		return;
+	}
+
+	if( sMostRecent == NULL )
+	{
+		// No most recent, so store this and create notification
+		// asking the user whether to apply or not.
+		sMostRecent = wl;
+		LLNotifications::instance()
+			.add("ConfirmLightShare",
+			     LLSD(), LLSD(), 
+			     boost::bind(&applyCallback, _1, _2));
+		return;
+	}
+	else
+	{
+		// No new notification (to avoid spamming the user), just
+		// store this as most recent.
+		delete sMostRecent;
+		sMostRecent = wl;
+		return;
 	}
 }
 
+
 // static
 bool WindlightMessage::applyCallback(const LLSD& notification,
                                      const LLSD& response)
-- 
cgit v1.1


From 52837b1a3b63eaa07cc784c4b4aca0e98e8e43e9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 30 Jul 2010 01:39:50 -0500
Subject: Added notification option to ignore all LightShare until you change
 regions.

---
 linden/indra/newview/lightshare.cpp                | 37 ++++++++++++++++++----
 linden/indra/newview/lightshare.h                  |  2 ++
 linden/indra/newview/llviewermessage.cpp           |  7 ++++
 .../skins/default/xui/en-us/notifications.xml      | 15 +++------
 4 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index e7c3410..b2bbb96 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -48,6 +48,7 @@ const std::string WindlightMessage::sSkyPresetName   = "(Region settings)";
 
 WindlightMessage* WindlightMessage::sMostRecent = NULL;
 LLTimer* WindlightMessage::sIgnoreTimer = new LLTimer();
+bool WindlightMessage::sIgnoreRegion = false;
 
 
 WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
@@ -132,6 +133,13 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 		return;
 	}
 
+	if(sIgnoreRegion)
+	{
+		// We are ignoring new settings until user enters a new region.
+		delete wl;
+		return;
+	}
+
 	if( sMostRecent == NULL )
 	{
 		// No most recent, so store this and create notification
@@ -160,13 +168,23 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
 
-	if( option == 0 ) // "Apply"
+	switch(option)
 	{
-		sMostRecent->apply();
-	}
-	else if( option == 2 ) // "Ignore"
-	{
-		resetIgnoreTimer();
+		case 0:{
+			// "Apply"
+			sMostRecent->apply();
+			break;
+		}
+		case 1:{
+			// "Not Now", ignore until the region stops spamming
+			resetIgnoreTimer();
+			break;
+		}
+		case 2:{
+			// "Ignore", ignore all until user leaves the region
+			sIgnoreRegion = true;
+			break;
+		}
 	}
 
 	delete sMostRecent;
@@ -177,6 +195,13 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
 
 
 // static
+void WindlightMessage::resetRegion()
+{
+	sIgnoreRegion = false;
+}
+
+
+// static
 void WindlightMessage::resetIgnoreTimer()
 {
 	F32 time = gSavedSettings.getF32("LightShareIgnoreTimer");
diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/lightshare.h
index 5b24ae3..0b2965e 100644
--- a/linden/indra/newview/lightshare.h
+++ b/linden/indra/newview/lightshare.h
@@ -51,6 +51,7 @@ class WindlightMessage
 	static void processWindlight(LLMessageSystem* msg, void**);
 	static bool applyCallback(const LLSD& notification,
 	                          const LLSD& response);
+	static void resetRegion();
 
 	bool apply();
 	bool isValid();
@@ -64,6 +65,7 @@ class WindlightMessage
 
 	static WindlightMessage* sMostRecent;
 	static LLTimer* sIgnoreTimer;
+	static bool sIgnoreRegion;
 
 	Meta7WindlightPacket* mPacket;
 	LLWaterParamSet* mWater;
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 353fd9f..bc1aedb 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -65,6 +65,7 @@
 #include "lltimer.h"
 #include "llmd5.h"
 
+#include "lightshare.h"
 #include "llagent.h"
 #include "llcallingcard.h"
 #include "llconsole.h"
@@ -3253,6 +3254,9 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 //	gTeleportDisplay = TRUE;
 //	gTeleportDisplayTimer.reset();
 //	gViewerWindow->setShowProgress(TRUE);
+
+	// Tell the LightShare handler that we have changed regions.
+	WindlightMessage::resetRegion();
 }
 
 // stuff we have to do every time we get an AvatarInitComplete from a sim
@@ -3500,6 +3504,9 @@ void process_crossed_region(LLMessageSystem* msg, void**)
 
 	LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host);
 	regionp->setSeedCapability(seedCap);
+
+	// Tell the LightShare handler that we have changed regions.
+	WindlightMessage::resetRegion();
 }
 
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 2a0af02..c59d713 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6996,18 +6996,13 @@ Note: To comply with the Second Life Terms of Service, Imprudence did not downlo
  name="ConfirmLightShare"
  type="notify"
  icon="notify.tga">
-This region has custom sky and water settings.
+This region is broadcasting custom sky and water settings.
 
-Apply region settings now?
+Apply this region's settings? (&quot;Ignore&quot; will ignore all region settings until you leave this region.)
   <form name="form">
-    <button
-     index="0"
-     name="Apply"
-     text="Apply"/>
-    <button
-     index="2"
-     name="Ignore"
-     text="Ignore"/>
+    <button index="0" name="apply"  text="Apply"/>
+    <button index="1" name="temp"   text="Not Now"/>
+    <button index="2" name="region" text="Ignore"/>
   </form>
 </notification>
 
-- 
cgit v1.1


From b6478ed527c35a817a72f351fae2169ed7ba2827 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 31 Jul 2010 01:11:11 -0500
Subject: Tidied up and documented lightshare.cpp and lightshare.h.

---
 linden/indra/newview/lightshare.cpp | 26 +++++++----------
 linden/indra/newview/lightshare.h   | 57 ++++++++++++++++++++++++++++++-------
 2 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index b2bbb96..1d87ab1 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -2,7 +2,7 @@
  * @file lightshare.cpp
  * @brief Handler for Meta7 Lightshare (region-side Windlight settings).
  *
- * Copyright (c) 2010, Tom Meta / Meta7
+ * Copyright (c) 2010, Tom Grimshaw (Tom Meta)
  * Copyright (c) 2010, Jacek Antonelli
  *
  * The source code in this file ("Source Code") is provided to you
@@ -30,8 +30,6 @@
 #include "lightshare.h"
 
 #include "linden_common.h"
-
-#include "lluuid.h"
 #include "llviewercontrol.h"
 #include "llwaterparammanager.h"
 #include "llwaterparamset.h"
@@ -41,7 +39,6 @@
 #include "meta7windlight.h"
 
 
-// The names of the presets where the region settings are stored.
 const std::string WindlightMessage::sWaterPresetName = "(Region settings)";
 const std::string WindlightMessage::sSkyPresetName   = "(Region settings)";
 
@@ -82,7 +79,7 @@ WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
 
 	mWater = new LLWaterParamSet();
 	mSky = new LLWLParamSet();
-	mWaterNormal = LLUUID();
+	mWaterNormal = new LLUUID();
 
 	process_packet(&buf[0]);
 	process_water();
@@ -97,6 +94,7 @@ WindlightMessage::~WindlightMessage()
 {
 	delete mWater;
 	delete mSky;
+	delete mWaterNormal;
 }
 
 
@@ -127,8 +125,8 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 	if( !ignoreTimerHasExpired() )
 	{
 		// The user recently ignored a windlight message, so ignore
-		// this one too, and reset the timer.
-		resetIgnoreTimer();
+		// this one too, and restart the timer.
+		restartIgnoreTimer();
 		delete wl;
 		return;
 	}
@@ -145,10 +143,8 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 		// No most recent, so store this and create notification
 		// asking the user whether to apply or not.
 		sMostRecent = wl;
-		LLNotifications::instance()
-			.add("ConfirmLightShare",
-			     LLSD(), LLSD(), 
-			     boost::bind(&applyCallback, _1, _2));
+		LLNotifications::instance().add("ConfirmLightShare", LLSD(), LLSD(), 
+		                                boost::bind(&applyCallback, _1, _2));
 		return;
 	}
 	else
@@ -177,7 +173,7 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
 		}
 		case 1:{
 			// "Not Now", ignore until the region stops spamming
-			resetIgnoreTimer();
+			restartIgnoreTimer();
 			break;
 		}
 		case 2:{
@@ -202,7 +198,7 @@ void WindlightMessage::resetRegion()
 
 
 // static
-void WindlightMessage::resetIgnoreTimer()
+void WindlightMessage::restartIgnoreTimer()
 {
 	F32 time = gSavedSettings.getF32("LightShareIgnoreTimer");
 	sIgnoreTimer->start();
@@ -226,7 +222,7 @@ bool WindlightMessage::apply()
 	water_mgr->addParamSet( sWaterPresetName, *mWater );
 	water_mgr->savePreset( sWaterPresetName );
 	water_mgr->loadPreset( sWaterPresetName, true );
-	water_mgr->setNormalMapID( mWaterNormal );
+	water_mgr->setNormalMapID( *mWaterNormal );
 
 	mSky->mName = sSkyPresetName;
 	sky_mgr->mAnimator.mIsRunning = false;
@@ -306,7 +302,7 @@ void WindlightMessage::process_water()
 		(U8)(mPacket->normalMapTexture[14]),
 		(U8)(mPacket->normalMapTexture[15]));
 
-	mWaterNormal.set(uuid);
+	mWaterNormal->set(uuid);
 }
 
 
diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/lightshare.h
index 0b2965e..f179458 100644
--- a/linden/indra/newview/lightshare.h
+++ b/linden/indra/newview/lightshare.h
@@ -1,6 +1,6 @@
 /**
  * @file lightshare.h
- * @brief Public interface for lightshare.cpp
+ * @brief WindlightMessage class definition.
  *
  * Copyright (c) 2010, Jacek Antonelli
  *
@@ -29,38 +29,67 @@
 #ifndef LIGHTSHARE_H
 #define LIGHTSHARE_H
 
-#include "message.h"
-#include "meta7windlight.h"
-#include "lltimer.h"
-#include "llwaterparamset.h"
-#include "llwlparamset.h"
+#include <string>
+
+struct Meta7WindlightPacket;
+class LLMessageSystem;
+class LLSD;
+class LLTimer;
+class LLUUID;
+class LLWaterParamSet;
+class LLWLParamSet;
 
 
 // Encapsulates a "Windlight" (LightShare) message sent from the
-// server, allowing the settings to be applied at a later time.
+// region, allowing the settings to be applied at a later time.
 //
 class WindlightMessage
 {
 	public:
 
+	// Constructs a new WindlightMessage instance from a GenericMessage
+	// with the "Windlight" method, such as those sent by a
+	// Lightshare-enabled OpenSim region.
+	WindlightMessage( LLMessageSystem* msg );
+
+	~WindlightMessage();
+
+	// The name of the water preset where the region settings are stored.
 	static const std::string sWaterPresetName;
+
+	// The name of the sky preset where the region settings are stored.
 	static const std::string sSkyPresetName;
 
-	WindlightMessage( LLMessageSystem* msg );
-	~WindlightMessage();
+	// Message handler for GenericMessage with the "Windlight" method.
+	// Creates and applies a new WindlightMessage (or prompts user).
 	static void processWindlight(LLMessageSystem* msg, void**);
+
+	// Callback when the user interacts with the notification.
 	static bool applyCallback(const LLSD& notification,
 	                          const LLSD& response);
+
+	// Called after the user has entered a new region, to reset the
+	// "ignore while in this region" state.
 	static void resetRegion();
 
+	// Applies/activates the Windlight settings from the message.
 	bool apply();
+
+	// Returns true if the message contains valid Windlight settings.
+	// (But there's no real validation yet, so this is always true.)
 	bool isValid();
 
+
 	protected:
 
-	static void resetIgnoreTimer();
+	// Restart the timer for temporarily ignoring settings.
+	static void restartIgnoreTimer();
+
+	// Returns true if the ignore timer has expired (i.e. new settings
+	// should not be ignored anymore).
 	static bool ignoreTimerHasExpired();
 
+
 	private:
 
 	static WindlightMessage* sMostRecent;
@@ -70,12 +99,18 @@ class WindlightMessage
 	Meta7WindlightPacket* mPacket;
 	LLWaterParamSet* mWater;
 	LLWLParamSet* mSky;
-	LLUUID mWaterNormal;
+	LLUUID* mWaterNormal;
 	bool mIsValid;
 
+	// Converts the message's raw bytes into a Meta7WindlightPacket.
 	void process_packet( char* buf );
+
+	// Constructs a LLWaterParamSet from the Meta7WindlightPacket.
 	void process_water();
+
+	// Constructs a LLWLParamSet from the Meta7WindlightPacket.
 	void process_sky();
+
 };
 
 #endif
-- 
cgit v1.1


From 01c58ce93558875c857cf43a32e5d3ce14d74fd5 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 1 Aug 2010 00:08:39 -0500
Subject: Get user confirmation even when using default Windlight settings.

This might be end up being a bit annoying, but it limits the potential
for abuse (e.g. a bad script that cycles between light and dark could
trigger seizures in some users, and sheer annoyance in the rest).

We may want to add region whitelists and blacklists later.
---
 linden/indra/newview/lightshare.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index 1d87ab1..28b3d97 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -112,10 +112,9 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 	std::string water = LLWaterParamManager::instance()->mCurParams.mName;
 	std::string sky = LLWLParamManager::instance()->mCurParams.mName;
 
-	// If they are using the default or region settings, just apply
-	// the new settings, don't bother asking.
-	if( (sky == "Default" || sky == sSkyPresetName) &&
-	    (water == "Default" || water == sWaterPresetName) )
+	// If they are using region settings already, just apply the new
+	// settings, don't bother asking.
+	if( sky == sSkyPresetName && water == sWaterPresetName )
 	{
 		wl->apply();
 		delete wl;
-- 
cgit v1.1


From c47afb87609e9843f83ca194f7cdb76fa1aea697 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 1 Aug 2010 03:04:45 -0500
Subject: LLComboBox now properly respects control_name.

---
 linden/indra/llui/llcombobox.cpp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index ce75f03..be34325 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -213,6 +213,21 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
 		combo_box->selectFirstItem();
 	}
 
+	const std::string& control_name = combo_box->getControlName();
+	if (!control_name.empty())
+	{
+		LLControlVariable* control = combo_box->findControl(control_name);
+		if (control != NULL)
+		{
+			combo_box->setValue( control->getValue() );
+		}
+		else
+		{
+			llwarns << "combo_box \"" << name << "\" has control_name \""
+			        << control_name << "\", but control is NULL." << llendl;
+		}
+	}
+
 	return combo_box;
 }
 
@@ -244,6 +259,7 @@ void LLComboBox::onCommit()
 		mTextEntry->setValue(getSimple());
 		mTextEntry->setTentative(FALSE);
 	}
+	setControlValue( getValue() );
 	LLUICtrl::onCommit();
 }
 
-- 
cgit v1.1


From 7e7f17b56f6c8231660c15d9669098a916381e65 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 1 Aug 2010 03:42:23 -0500
Subject: Removed control_name from old combo boxes to avoid conflicts.

---
 .../newview/skins/default/xui/en-us/floater_ao.xml | 34 +++++++++++-----------
 .../xui/en-us/floater_hardware_settings.xml        |  2 +-
 .../xui/en-us/panel_preferences_general.xml        |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml b/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml
index 134bd13..17c205f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_ao.xml
@@ -135,7 +135,7 @@
 	         mouse_opaque="true" name="textdefaultwalk" v_pad="0" width="180">
         Default Walk:
       </text>
-      <combo_box name="walks" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultWalk" />
+      <combo_box name="walks" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
 
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
@@ -143,105 +143,105 @@
 	         mouse_opaque="true" name="textdefaultrun" v_pad="0" width="180">
         Default Run:
       </text>
-      <combo_box name="runs" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultRun" />
+      <combo_box name="runs" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
 	         mouse_opaque="true" name="textdefaultjump" v_pad="0" width="180">
         Default Jump:
       </text>
-      <combo_box name="jumps" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultJump" />
+      <combo_box name="jumps" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
          bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
          font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
          mouse_opaque="true" name="textdefaultsit" v_pad="0" width="180">
         Default Sit:
       </text>
-      <combo_box name="sits" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultSit" />
+      <combo_box name="sits" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
 	         mouse_opaque="true" name="textdefaultgsit" v_pad="0" width="180">
         Default Groundsit:
       </text>
-      <combo_box name="gsits" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultGroundSit" />
+      <combo_box name="gsits" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
 	         mouse_opaque="true" name="textdefaultcrouch" v_pad="0" width="180">
         Default Crouch:
       </text>
-      <combo_box name="crouchs" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultCrouch" />
+      <combo_box name="crouchs" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
 	         mouse_opaque="true" name="textdefaultcrouchwalk" v_pad="0" width="180">
         Default Crouchwalk:
       </text>
-      <combo_box name="cwalks" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultCrouchWalk" />
+      <combo_box name="cwalks" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
 	         mouse_opaque="true" name="textdefaultfall" v_pad="0" width="180">
         Default Fall:
       </text>
-      <combo_box name="falls" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" control_name="AODefaultFall" />
+      <combo_box name="falls" label="" follows="left|top" height="20" left="10" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="280" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
 	         mouse_opaque="true" name="textdefaulthover" v_pad="0" width="180">
         Default Hover:
       </text>
-      <combo_box name="hovers" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultHover" />
+      <combo_box name="hovers" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
 	         mouse_opaque="true" name="textdefaultfly" v_pad="0" width="180">
         Default Fly:
       </text>
-      <combo_box name="flys" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultFly" />
+      <combo_box name="flys" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
 	         mouse_opaque="true" name="textdefaultflyslow" v_pad="0" width="180">
         Default Slow Fly:
       </text>
-      <combo_box name="flyslows" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultFlySlow" />
+      <combo_box name="flyslows" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
 	         mouse_opaque="true" name="textdefaultflyup" v_pad="0" width="180">
         Default Upward Fly:
       </text>
-      <combo_box name="flyups" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultFlyUp" />
+      <combo_box name="flyups" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
 	         mouse_opaque="true" name="textdefaultflydown" v_pad="0" width="180">
         Default Downward Fly:
       </text>
-      <combo_box name="flydowns" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultFlyDown" />
+      <combo_box name="flydowns" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
 	         mouse_opaque="true" name="textdefaultland" v_pad="0" width="180">
         Default Land:
       </text>
-      <combo_box name="lands" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultLand" />
+      <combo_box name="lands" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
 	         mouse_opaque="true" name="textdefaultstandup" v_pad="0" width="180">
         Default Standup:
       </text>
-      <combo_box name="standups" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultStandUp" />
+      <combo_box name="standups" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
       <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 	         bottom_delta="-40" drop_shadow_visible="true" follows="left|bottom"
 	         font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="0"
 	         mouse_opaque="true" name="textdefaultprejump" v_pad="0" width="180">
         Default Pre-Jump:
       </text>
-      <combo_box name="prejumps" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" control_name="AODefaultPreJump" />
+      <combo_box name="prejumps" label="" follows="left|top" height="20" left_delta="0" width="180" bottom_delta="0" />
   </panel>
 </tab_container>
-</floater>
\ No newline at end of file
+</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
index 8d5d6b4..24a895b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
@@ -19,7 +19,7 @@
 		left="10" mouse_opaque="true" name="Antialiasing:" v_pad="0" width="128">
     Antialiasing:
   </text>
-  <combo_box bottom="-65" control_name="RenderFSAASamples" enabled="true" follows="left|top"
+  <combo_box bottom="-65" enabled="true" follows="left|top"
 		font="SansSerifSmall" height="16" initial_value="false"
 		label="Antialiasing" left="148"
 		mouse_opaque="true" name="fsaa" width="64">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index 49ab842..199f2a8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -117,7 +117,7 @@
 		 I want to access content rated:
 	</text>
 	<combo_box bottom="-318" follows="left|top" height="18" left="315"
-	     mouse_opaque="true" name="maturity_desired_combobox" width="150" control_name="PreferredMaturity">
+	     mouse_opaque="true" name="maturity_desired_combobox" width="150">
 		<combo_item name="Desired_Adult" value="42">
 			PG, Mature and Adult
 		</combo_item>
-- 
cgit v1.1


From a9b6989fad493ccc2bb8aae0ffe1e11783635261 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 1 Aug 2010 03:26:57 -0500
Subject: Revamped the LightShare option in Preferences > Advanced.

Instead of a checkbox, it's now a combo box with "Never",
"Ask me every time", or "Always".
---
 linden/indra/newview/app_settings/settings.xml     | 26 +++++++++-------------
 linden/indra/newview/lightshare.cpp                | 12 +++++-----
 linden/indra/newview/lightshare.h                  |  8 +++++++
 linden/indra/newview/llprefsadvanced.cpp           |  2 --
 .../xui/en-us/panel_preferences_advanced.xml       | 25 +++++++++++++++++----
 5 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index e2871ad..25474a7 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -310,6 +310,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>LightShareAllowed</key>
+  <map>
+    <key>Comment</key>
+    <string>Allow LightShare (Windlight settings broadcast from the region): Never (0), Ask (1), or Always (2).</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>LightShareIgnoreTimer</key>
   <map>
     <key>Comment</key>
@@ -12275,21 +12286,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-
-<!-- Begin: Use Serverside Windlight Settings -->
-    <key>UseServersideWindlightSettings</key>
-    <map>
-      <key>Comment</key>
-      <string>Whether or not to use Windlight settings presented by the server.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-<!-- End: Use Serverside Windlight Settings -->
-
     <key>UseStartScreen</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index 28b3d97..b422236 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -101,7 +101,7 @@ WindlightMessage::~WindlightMessage()
 // static
 void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 {
-	if( !gSavedSettings.getBOOL("UseServersideWindlightSettings") )
+	if( gSavedSettings.getU32("UseLightShare") <= LIGHTSHARE_NEVER )
 		return;
 
 	WindlightMessage* wl = new WindlightMessage(msg);
@@ -112,9 +112,10 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 	std::string water = LLWaterParamManager::instance()->mCurParams.mName;
 	std::string sky = LLWLParamManager::instance()->mCurParams.mName;
 
-	// If they are using region settings already, just apply the new
-	// settings, don't bother asking.
-	if( sky == sSkyPresetName && water == sWaterPresetName )
+	// If they are using region settings already, or LightShare is
+	// always allowed, just apply the new settings, don't bother asking.
+	if( gSavedSettings.getU32("UseLightShare") == LIGHTSHARE_ALWAYS ||
+	    (sky == sSkyPresetName && water == sWaterPresetName) )
 	{
 		wl->apply();
 		delete wl;
@@ -137,7 +138,8 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 		return;
 	}
 
-	if( sMostRecent == NULL )
+	if( gSavedSettings.getU32("UseLightShare") == LIGHTSHARE_ASK &&
+	    sMostRecent == NULL )
 	{
 		// No most recent, so store this and create notification
 		// asking the user whether to apply or not.
diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/lightshare.h
index f179458..e3cccf0 100644
--- a/linden/indra/newview/lightshare.h
+++ b/linden/indra/newview/lightshare.h
@@ -47,6 +47,14 @@ class WindlightMessage
 {
 	public:
 
+	// The meanings of the LightShareAllowed user setting.
+	enum LIGHTSHARE_ALLOWED
+	{
+		LIGHTSHARE_NEVER  = 0,
+		LIGHTSHARE_ASK    = 1,
+		LIGHTSHARE_ALWAYS = 2,
+	};
+
 	// Constructs a new WindlightMessage instance from a GenericMessage
 	// with the "Windlight" method, such as those sent by a
 	// Lightshare-enabled OpenSim region.
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 6489f52..675a87f 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -58,7 +58,6 @@ BOOL LLPrefsAdvanced::postBuild()
 	childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
 	childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens"));
 	childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag"));
-	childSetValue("windlight_check", gSavedSettings.getBOOL("UseServersideWindlightSettings"));
 	childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers"));
 	childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP"));
 	childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
@@ -84,7 +83,6 @@ void LLPrefsAdvanced::apply()
 	gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
 	gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
 	gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
-	gSavedSettings.setBOOL("UseServersideWindlightSettings", childGetValue("windlight_check"));
 	gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
 
 	// Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index af8cb1e..1b463a2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -26,11 +26,28 @@
        font="SansSerifSmall" height="16" initial_value="false"
        label="Enable shadows (WARNING: unstable and requires Ultra graphics)" left="12" mouse_opaque="true"
        name="shadows_check" radio_style="false" width="217" />
+
+
+  <text bottom_delta="-25" left="16" height="15" width="220"
+        follows="top|left">
+    Allow region Windlight settings (LightShare):
+  </text>
+  <combo_box name="lightshare_combo" control_name="LightShareAllowed"
+             bottom_delta="-2" left="240" height="18" width="120"
+             allow_text_entry="false" follows="left|top">
+    <combo_item type="string" name="never" value="0">
+      Never
+    </combo_item>
+    <combo_item type="string" name="ask" value="1">
+      Ask me every time
+    </combo_item>
+    <combo_item type="string" name="always" value="2">
+      Always
+    </combo_item>
+  </combo_box>
+
+
   <check_box bottom_delta="-25" enabled="true" follows="left|top"
-       font="SansSerifSmall" height="16" initial_value="true"
-       label="Use server-side WindLight settings" left="12" mouse_opaque="true"
-       name="windlight_check" radio_style="false" width="217" />
-  <check_box bottom_delta="-18" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
        label="Use HTTP texture fetching" left="12" mouse_opaque="true"
        name="http_texture_check" radio_style="false" width="217" />
-- 
cgit v1.1


From ff0e1296129a67be8d4a2c00dcc6a9ac537b2894 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 1 Aug 2010 15:57:53 -0500
Subject: Made the LightShare preference behave like the other preferences.

i.e. it only goes into effect if you press Apply/OK.
---
 linden/indra/newview/llprefsadvanced.cpp                             | 5 +++++
 .../newview/skins/default/xui/en-us/panel_preferences_advanced.xml   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 675a87f..7830c29 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -65,6 +65,8 @@ BOOL LLPrefsAdvanced::postBuild()
 	childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
 	childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
 	childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic"));
+	childSetValue("lightshare_combo",
+	              LLSD((S32)gSavedSettings.getU32("LightShareAllowed")));
 
 	LLComboBox* crash_behavior_combobox = getChild<LLComboBox>("crash_behavior_combobox");
 	crash_behavior_combobox->setCurrentByIndex(gCrashSettings.getS32(CRASH_BEHAVIOR_SETTING));
@@ -84,6 +86,9 @@ void LLPrefsAdvanced::apply()
 	gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
 	gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
 	gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
+	gSavedSettings.setU32("LightShareAllowed",
+	                      (U32)childGetValue("lightshare_combo").asInteger());
+
 
 	// Need to force a rebake when ClothingLayerProtection toggled for it take effect -- MC
 	if (gSavedSettings.getBOOL("ShowMyClientTagToOthers") != (BOOL)childGetValue("client_name_tag_broadcast_check"))
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 1b463a2..de34ebd 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -32,7 +32,7 @@
         follows="top|left">
     Allow region Windlight settings (LightShare):
   </text>
-  <combo_box name="lightshare_combo" control_name="LightShareAllowed"
+  <combo_box name="lightshare_combo"
              bottom_delta="-2" left="240" height="18" width="120"
              allow_text_entry="false" follows="left|top">
     <combo_item type="string" name="never" value="0">
-- 
cgit v1.1


From 7c21ea38747046047323505c1c5e948e4297c79c Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Thu, 29 Jul 2010 00:52:54 +0200
Subject: revamp a) privatelookattarget + b) privatepointattarget

a) grey crosshair 2.5m in front
b) just don't show the editing motion
---
 linden/indra/newview/app_settings/settings.xml | 11 +++++++++
 linden/indra/newview/llglsandbox.cpp           | 22 ++----------------
 linden/indra/newview/llhudeffectlookat.cpp     | 32 +++++++++++++++++++++++---
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 25474a7..1f5c7b2 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -469,6 +469,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>PrivatePointAtTarget</key>
+  <map>
+    <key>Comment</key>
+    <string>If true, viewer won't show the editing arm motion.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>SavedRenderFarClip</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index e9077a9..3acfbf3 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -71,18 +71,6 @@
  
 BOOL LLAgent::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position)
 {
-	if (object && target_type != LOOKAT_TARGET_NONE && gSavedSettings.getBOOL("PrivateLookAtTarget"))
-	{
-		target_type = LOOKAT_TARGET_NONE;
-		object = mAvatarObject;
-		position.clearVec();
-		LLViewerObject* source_obj = mLookAt->getSourceObject();
-		if (source_obj)
-		{
-			mLookAt->setTargetObject(source_obj);
-		}
-	}
-
 	if(object && object->isAttachment())
 	{
 		LLViewerObject* parent = object;
@@ -109,18 +97,12 @@ BOOL LLAgent::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVecto
 BOOL LLAgent::setPointAt(EPointAtType target_type, LLViewerObject *object, LLVector3 position)
 {
 	// disallow pointing at attachments and avatars
-	if (object && (object->isAttachment() || object->isAvatar()))
+	bool private_pointat = gSavedSettings.getBOOL("PrivatePointAtTarget");//this is the arm motion
+	if (object && (object->isAttachment() || object->isAvatar() || private_pointat))
 	{
 		return FALSE;
 	}
 
-	if (object && target_type != POINTAT_TARGET_NONE && gSavedSettings.getBOOL("PrivateLookAtTarget"))
-	{
-		target_type = POINTAT_TARGET_NONE;
-		object = NULL;
-		position.clearVec();
-	}
-
 	if(!mPointAt || mPointAt->isDead())
 	{
 		mPointAt = (LLHUDEffectPointAt *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINTAT);
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index 60b2b89..1c24e7d 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -287,18 +287,44 @@ void LLHUDEffectLookAt::packData(LLMessageSystem *mesgsys)
 
 	// pack both target object and position
 	// position interpreted as offset if target object is non-null
+	ELookAtType	target_type 		= mTargetType;
+	LLVector3d	target_offset_global 	= mTargetOffsetGlobal;
+	LLViewerObject* target_object		= (LLViewerObject*)mTargetObject;
+
+	LLViewerObject* source_object = (LLViewerObject*)mSourceObject;
+	LLVOAvatar* source_avatar = NULL;
+
+	if (source_object && source_object->isAvatar()) //strange enough that non-avatar objects try to send a lookat message
+	{
+		source_avatar = (LLVOAvatar*)source_object;
+	}
+
+	if (source_avatar)
+	{
+		bool is_self = source_avatar->isSelf(); //more strange if it is not self.
+		bool is_private = gSavedSettings.getBOOL("PrivateLookAtTarget"); 
+	
+		if (is_private && is_self)
+		{
+			//this mimicks "do nothing"
+			target_type = LOOKAT_TARGET_AUTO_LISTEN;
+			target_offset_global.setVec(2.5, 0.0, 0.0);
+			target_object = mSourceObject;
+		}
+	}
+
 	if (mTargetObject)
 	{
-		htonmemcpy(&(packed_data[TARGET_OBJECT]), mTargetObject->mID.mData, MVT_LLUUID, 16);
+		htonmemcpy(&(packed_data[TARGET_OBJECT]), target_object->mID.mData, MVT_LLUUID, 16);
 	}
 	else
 	{
 		htonmemcpy(&(packed_data[TARGET_OBJECT]), LLUUID::null.mData, MVT_LLUUID, 16);
 	}
 
-	htonmemcpy(&(packed_data[TARGET_POS]), mTargetOffsetGlobal.mdV, MVT_LLVector3d, 24);
+	htonmemcpy(&(packed_data[TARGET_POS]), target_offset_global.mdV, MVT_LLVector3d, 24);
 
-	U8 lookAtTypePacked = (U8)mTargetType;
+	U8 lookAtTypePacked = (U8)target_type;
 	
 	htonmemcpy(&(packed_data[LOOKAT_TYPE]), &lookAtTypePacked, MVT_U8, 1);
 
-- 
cgit v1.1


From 08c29aea25645dbfe76a04de9e703f49cf7ada85 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Thu, 29 Jul 2010 16:13:19 +0200
Subject: some more HUDEffect revamp

---
 linden/indra/newview/app_settings/logcontrol.xml   |  1 +
 linden/indra/newview/llhudeffectbeam.cpp           | 25 +++++++-
 linden/indra/newview/llhudeffectlookat.cpp         | 75 +++++++++++++---------
 linden/indra/newview/llhudeffectpointat.cpp        | 26 ++++++++
 linden/indra/newview/llviewermenu.cpp              | 43 ++++++++++---
 .../skins/default/xui/en-us/menu_viewer.xml        | 15 +++--
 6 files changed, 140 insertions(+), 45 deletions(-)

diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index 1f84f49..281cc38 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -52,6 +52,7 @@
 							<!--<string>AudioEngine</string>-->
               <!--<string>InitInfo</string>-->
               <!--<string>isOwnedSelf</string>-->
+							<!--<string>HUDEffect</string>-->
               <!--<string>MarkerFile</string>-->
 							<!--<string>MediaImpl</string>-->
 							<!--<string>MediaInfo</string>-->
diff --git a/linden/indra/newview/llhudeffectbeam.cpp b/linden/indra/newview/llhudeffectbeam.cpp
index a7c1214..f6dff50 100644
--- a/linden/indra/newview/llhudeffectbeam.cpp
+++ b/linden/indra/newview/llhudeffectbeam.cpp
@@ -83,9 +83,30 @@ LLHUDEffectBeam::~LLHUDEffectBeam()
 
 void LLHUDEffectBeam::packData(LLMessageSystem *mesgsys)
 {
-	if (!mSourceObject)
+	LLViewerObject* source_object = (LLViewerObject*)mSourceObject;
+
+	if (!source_object)
+	{
+		markDead();
+		return;
+	}
+	else if (!source_object->isAvatar())
 	{
-		llwarns << "Missing source object!" << llendl;
+		LL_DEBUGS("HUDEffect")<<"Non-Avatar HUDEffectBeam message for ID: " 
+			<<  source_object->getID().asString()<< LL_ENDL;
+		markDead();
+		return;
+	}
+	else 
+	{
+		LLVOAvatar* source_avatar = (LLVOAvatar*)source_object;
+		if (!source_avatar->isSelf())
+		{
+			LL_DEBUGS("HUDEffect")<<"Non-self HUDEffectBeam message for ID: " 
+				<< source_avatar->getID().asString()<< LL_ENDL;
+			markDead();
+			return;
+		}
 	}
 
 	// Pack the default data
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index 1c24e7d..a997910 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -269,48 +269,65 @@ LLHUDEffectLookAt::~LLHUDEffectLookAt()
 //-----------------------------------------------------------------------------
 void LLHUDEffectLookAt::packData(LLMessageSystem *mesgsys)
 {
-	// Pack the default data
-	LLHUDEffect::packData(mesgsys);
-
-	// Pack the type-specific data.  Uses a fun packed binary format.  Whee!
-	U8 packed_data[PKT_SIZE];
-	memset(packed_data, 0, PKT_SIZE);
-
-	if (mSourceObject)
-	{
-		htonmemcpy(&(packed_data[SOURCE_AVATAR]), mSourceObject->mID.mData, MVT_LLUUID, 16);
-	}
-	else
-	{
-		htonmemcpy(&(packed_data[SOURCE_AVATAR]), LLUUID::null.mData, MVT_LLUUID, 16);
-	}
-
 	// pack both target object and position
 	// position interpreted as offset if target object is non-null
 	ELookAtType	target_type 		= mTargetType;
 	LLVector3d	target_offset_global 	= mTargetOffsetGlobal;
 	LLViewerObject* target_object		= (LLViewerObject*)mTargetObject;
 
+
 	LLViewerObject* source_object = (LLViewerObject*)mSourceObject;
 	LLVOAvatar* source_avatar = NULL;
 
-	if (source_object && source_object->isAvatar()) //strange enough that non-avatar objects try to send a lookat message
+	if (!source_object)
+	{
+		markDead();
+		return;
+	}
+	if (source_object->isAvatar()) //strange enough that non-objects try
+							//to send a lookat message ...
 	{
 		source_avatar = (LLVOAvatar*)source_object;
 	}
+	else //... more strange if its an non-avatar object ...
+	{
+		LL_DEBUGS("HUDEffect")<<"Non-Avatar HUDEffectLookAt message for ID: " <<  source_object->getID().asString()<< LL_ENDL;
+		markDead();
+		return;
+	}
 
-	if (source_avatar)
+
+	bool is_self = source_avatar->isSelf();
+	bool is_private = gSavedSettings.getBOOL("PrivateLookAtTarget");
+	if (!is_self) //... very strange if it is not self. But happens. Also at local opensim.
 	{
-		bool is_self = source_avatar->isSelf(); //more strange if it is not self.
-		bool is_private = gSavedSettings.getBOOL("PrivateLookAtTarget"); 
-	
-		if (is_private && is_self)
-		{
-			//this mimicks "do nothing"
-			target_type = LOOKAT_TARGET_AUTO_LISTEN;
-			target_offset_global.setVec(2.5, 0.0, 0.0);
-			target_object = mSourceObject;
-		}
+		LL_DEBUGS("HUDEffect")<< "Non-self Avatar HUDEffectLookAt message for ID: " << source_avatar->getID().asString() << LL_ENDL;
+		markDead();
+		return;
+	}
+	else if (is_private && target_type != LOOKAT_TARGET_AUTO_LISTEN)
+	{
+		//this mimicks "do nothing"
+		target_type = LOOKAT_TARGET_AUTO_LISTEN;
+		target_offset_global.setVec(2.5, 0.0, 0.0);
+		target_object = mSourceObject;
+	}
+
+
+	// Pack the default data
+	LLHUDEffect::packData(mesgsys);
+
+	// Pack the type-specific data.  Uses a fun packed binary format.  Whee!
+	U8 packed_data[PKT_SIZE];
+	memset(packed_data, 0, PKT_SIZE);
+
+	if (mSourceObject)
+	{
+		htonmemcpy(&(packed_data[SOURCE_AVATAR]), mSourceObject->mID.mData, MVT_LLUUID, 16);
+	}
+	else //um ... we already returned ... how's that the case?
+	{
+		htonmemcpy(&(packed_data[SOURCE_AVATAR]), LLUUID::null.mData, MVT_LLUUID, 16);
 	}
 
 	if (mTargetObject)
@@ -396,7 +413,7 @@ void LLHUDEffectLookAt::unpackData(LLMessageSystem *mesgsys, S32 blocknum)
 	htonmemcpy(&lookAtTypeUnpacked, &(packed_data[LOOKAT_TYPE]), MVT_U8, 1);
 	if (lookAtTypeUnpacked > 10)
 	{
-		LL_DEBUGS("LookAt")<< "wrong lookAtTypeUnpacked: " << lookAtTypeUnpacked << LL_ENDL;
+		LL_DEBUGS("HUDEffect")<< "wrong lookAtTypeUnpacked: " << lookAtTypeUnpacked << LL_ENDL;
 		lookAtTypeUnpacked = 0;
 	}
 
diff --git a/linden/indra/newview/llhudeffectpointat.cpp b/linden/indra/newview/llhudeffectpointat.cpp
index 2b82748..17485cf 100644
--- a/linden/indra/newview/llhudeffectpointat.cpp
+++ b/linden/indra/newview/llhudeffectpointat.cpp
@@ -103,6 +103,32 @@ LLHUDEffectPointAt::~LLHUDEffectPointAt()
 //-----------------------------------------------------------------------------
 void LLHUDEffectPointAt::packData(LLMessageSystem *mesgsys)
 {
+	LLViewerObject* source_object = (LLViewerObject*)mSourceObject;
+
+	if (!source_object) 
+	{
+		markDead();
+		return;
+	}
+	else if (!source_object->isAvatar())
+	{
+		LL_DEBUGS("HUDEffect")<<"Non-Avatar HUDEffectPointAt message for ID: " 
+			<<  source_object->getID().asString()<< LL_ENDL;
+		markDead();
+		return;
+	}
+	else 
+	{
+		LLVOAvatar* source_avatar = (LLVOAvatar*)source_object;
+		if (!source_avatar->isSelf())
+		{
+			LL_DEBUGS("HUDEffect")<<"Non-self HUDEffectPointAt message for ID: " 
+				<< source_avatar->getID().asString()<< LL_ENDL;
+			markDead();
+			return;
+		}
+	}
+
 	// Pack the default data
 	LLHUDEffect::packData(mesgsys);
 
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 6a7a818..4012505 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -10143,15 +10143,28 @@ class LLAdvancedTogglePrivateLookPointAt : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		// Noate: PrivateLookAtTarget also hides point at -- MC
-		bool new_value = !gSavedSettings.getBOOL("PrivateLookAtTarget");
-		if (new_value)
+		std::string command = userdata.asString();
+		if ("Look" == command)
+		{
+			bool new_value = !gSavedSettings.getBOOL("PrivateLookAtTarget");
+			if (new_value)
+			{
+				// Disable show look at and show point at if you make yours private. It's only fair, after all -- MC
+				LLHUDEffectLookAt::sDebugLookAt = FALSE;
+				LLHUDEffectPointAt::sDebugPointAt = FALSE;
+			}
+			gSavedSettings.setBOOL("PrivateLookAtTarget", new_value);
+		}
+		else if ("Point" == command)
 		{
-			// Disable show look at and show point at if you make yours private. It's only fair, after all -- MC
-			LLHUDEffectLookAt::sDebugLookAt = FALSE;
-			LLHUDEffectPointAt::sDebugPointAt = FALSE;
+			bool new_value = !gSavedSettings.getBOOL("PrivatePointAtTarget");
+
+			// do not disable show look at and show point at if you make yours private,
+			// since this only hides the arm motion while editing -- AW
+
+			gSavedSettings.setBOOL("PrivatePointAtTarget", new_value);
 		}
-		gSavedSettings.setBOOL("PrivateLookAtTarget", new_value);
+
 		return true;
 	}
 };
@@ -10160,9 +10173,19 @@ class LLAdvancedCheckPrivateLookPointAt : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		bool new_value = gSavedSettings.getBOOL("PrivateLookAtTarget");
-		std::string control_name = userdata["control"].asString();
-		gMenuHolder->findControl(control_name)->setValue(new_value);
+		std::string command = userdata["data"].asString();
+		if ("Look" == command)
+		{
+			bool new_value = gSavedSettings.getBOOL("PrivateLookAtTarget");
+			std::string control_name = userdata["control"].asString();
+			gMenuHolder->findControl(control_name)->setValue(new_value);
+		}
+		else if ("Point" == command)
+		{
+			bool new_value = gSavedSettings.getBOOL("PrivatePointAtTarget");
+			std::string control_name = userdata["control"].asString();
+			gMenuHolder->findControl(control_name)->setValue(new_value);
+		}
 		return true;
 	}
 };
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 5d97a60..8033ba7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1860,12 +1860,19 @@
         <on_check function="Advanced.CheckShowPointAt"
                   userdata="" />
       </menu_item_check>
-      <menu_item_check name="Private Look/Point At"
-                       label="Private Look/Point At">
+      <menu_item_check name="Private Look At"
+                       label="Private Look At">
         <on_click function="Advanced.TogglePrivateLookPointAt"
-                  userdata="" />
+                  userdata="Look" />
         <on_check function="Advanced.CheckPrivateLookPointAt"
-                  userdata="" />
+                  userdata="Look" />
+      </menu_item_check>
+      <menu_item_check name="Private Point At"
+                       label="Private Point At">
+        <on_click function="Advanced.TogglePrivateLookPointAt"
+                  userdata="Point" />
+        <on_check function="Advanced.CheckPrivateLookPointAt"
+                  userdata="Point" />
       </menu_item_check>
       <menu_item_check name="Debug Joint Updates"
                        label="Debug Joint Updates">
-- 
cgit v1.1


From 1587c4e3121713da16656187d1c0f5d85ad279d1 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Thu, 29 Jul 2010 01:30:23 +0200
Subject: fix crash on relog introduced in 66b8150d4ec94161887c

---
 linden/indra/newview/llviewermenu.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 4012505..fb69389 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -546,6 +546,11 @@ void LLMenuParcelObserver::changed()
 // code required to calculate anything about the menus
 void pre_init_menus()
 {
+	if (gMenuHolder)
+	{
+		cleanup_menus();
+	}
+
 	// static information
 	LLColor4 color;
 	color = gColors.getColor( "MenuDefaultBgColor" );
-- 
cgit v1.1


From d0e4b54cef5f8b582ece01d6a206c4e93f649b13 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Thu, 29 Jul 2010 23:04:28 +0200
Subject: don't show textures without fetcher in texture-console (backport from
 Viewer 2.1)

---
 linden/indra/newview/lltextureview.cpp | 8 ++++++--
 linden/indra/newview/llviewerimage.h   | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/lltextureview.cpp b/linden/indra/newview/lltextureview.cpp
index cda01fa..04cebf5 100644
--- a/linden/indra/newview/lltextureview.cpp
+++ b/linden/indra/newview/lltextureview.cpp
@@ -666,6 +666,10 @@ void LLTextureView::draw()
 			 iter != gImageList.mImageList.end(); )
 		{
 			LLPointer<LLViewerImage> imagep = *iter++;
+			if(!imagep->hasFetcher())
+			{
+				continue ;
+			}
 
 			S32 cur_discard = imagep->getDiscardLevel();
 			S32 desired_discard = imagep->mDesiredDiscardLevel;
@@ -711,7 +715,7 @@ void LLTextureView::draw()
 				pri = imagep->getDecodePriority();
 			}
 			pri = llclamp(pri, 0.0f, HIGH_PRIORITY-1.f);
-			
+
 			if (sDebugImages.find(imagep) != sDebugImages.end())
 			{
 				pri += 4*HIGH_PRIORITY;
@@ -773,7 +777,7 @@ void LLTextureView::draw()
 			{
 				display_image_list.insert(std::make_pair(pri, imagep));
 			}
-		}
+		}//for
 		
 		if (mPrintList)
 		{
diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h
index fdf8ff0..fc27f17 100644
--- a/linden/indra/newview/llviewerimage.h
+++ b/linden/indra/newview/llviewerimage.h
@@ -277,7 +277,7 @@ public:
 	void setDecodePriority(F32 priority = -1.0f);
 
 	bool updateFetch();
-	
+	BOOL hasFetcher() const { return mHasFetcher;}
 	// Override the computation of discard levels if we know the exact output
 	// size of the image.  Used for UI textures to not decode, even if we have
 	// more data.
-- 
cgit v1.1


From 000b378f59bcd8bbdb4b50e5e5b60376ba239976 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 30 Jul 2010 14:05:09 +0200
Subject: small show client name of others tweaking

---
 linden/indra/newview/app_settings/settings.xml     | 25 ++++++++++++++++--
 linden/indra/newview/llhoverview.cpp               | 26 +++++++++++++++++++
 linden/indra/newview/llprefsadvanced.cpp           |  4 +++
 linden/indra/newview/llvoavatar.cpp                | 30 ++++++++++++++--------
 linden/indra/newview/llvoavatar.h                  |  3 ++-
 .../xui/en-us/panel_preferences_advanced.xml       | 20 ++++++++++++---
 6 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 1f5c7b2..dcbda36 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1055,7 +1055,28 @@
   </map>
 
   <!-- Begin: Client Name Tag -->
-
+  <key>ShowClientColor</key>
+  <map>
+    <key>Comment</key>
+    <string>Show *others* clients specific color in the name tag</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>ShowClientNameHoverTip</key>
+  <map>
+    <key>Comment</key>
+    <string>Show *others* client in the hovertip</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>ShowClientNameTag</key>
   <map>
     <key>Comment</key>
@@ -1067,7 +1088,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  
+
   <key>ShowMyClientTagToOthers</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 5d59818..8c367ab 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -64,6 +64,7 @@
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
 #include "llviewerwindow.h"
+#include "llvoavatar.h"
 #include "llglheaders.h"
 #include "llviewerimagelist.h"
 //#include "lltoolobjpicker.h"
@@ -272,6 +273,31 @@ void LLHoverView::updateText()
 				line.append(LLTrans::getString("TooltipPerson"));
 			}
 			mText.push_back(line);
+
+			if (gSavedSettings.getBOOL("ShowClientNameHoverTip"))
+			{
+				LLColor4 color;
+				std::string client;
+				LLVOAvatar* avatar = (LLVOAvatar*)hit_object;
+				if (avatar->isSelf())
+				{
+					client="Client: Imprudence";
+				}
+				else
+				{
+					LLVOAvatar::resolveClient(color, client, avatar);
+					if(client.empty() ||client == "Invalid" || client == "Failure")
+					{
+						client = "Client: <not available>";
+					}
+					else
+					{
+						client = "Client: " + client;
+					} 
+				}
+				mText.push_back(client);
+				
+			}
 		}
 		else
 		{
diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 7830c29..34c8eb2 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -58,6 +58,8 @@ BOOL LLPrefsAdvanced::postBuild()
 	childSetValue("disable_log_screen_check", gSavedSettings.getBOOL("DisableLoginLogoutScreens"));
 	childSetValue("disable_tp_screen_check", gSavedSettings.getBOOL("DisableTeleportScreens"));
 	childSetValue("client_name_tag_check", gSavedSettings.getBOOL("ShowClientNameTag"));
+	childSetValue("client_name_color_check", gSavedSettings.getBOOL("ShowClientColor"));
+	childSetValue("client_name_hover_check", gSavedSettings.getBOOL("ShowClientNameHoverTip"));
 	childSetValue("client_name_tag_broadcast_check", gSavedSettings.getBOOL("ShowMyClientTagToOthers"));
 	childSetValue("http_texture_check", gSavedSettings.getBOOL("ImagePipelineUseHTTP"));
 	childSetValue("speed_rez_check", gSavedSettings.getBOOL("SpeedRez"));
@@ -81,6 +83,8 @@ void LLPrefsAdvanced::apply()
 	gSavedSettings.setBOOL("DisableLoginLogoutScreens", childGetValue("disable_log_screen_check"));
 	gSavedSettings.setBOOL("DisableTeleportScreens", childGetValue("disable_tp_screen_check"));
 	gSavedSettings.setBOOL("ShowClientNameTag", childGetValue("client_name_tag_check"));
+	gSavedSettings.setBOOL("ShowClientColor", childGetValue("client_name_color_check"));
+	gSavedSettings.setBOOL("ShowClientNameHoverTip", childGetValue("client_name_hover_check"));
 	gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_texture_check"));
 	gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
 	gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 200b3a6..53962a9 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3544,21 +3544,29 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 				}
 				
 				LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" );
-				if (gSavedSettings.getBOOL("ShowClientNameTag"))
+				LLColor4 client_color = avatar_name_color;
+
+				if(!mIsSelf) //don't know your own client ?
 				{
-					if(!mIsSelf) //don't know your own client ?
+					new_name = TRUE; //lol or see the last client used 
 					{
-						new_name = TRUE; //lol or see the last client used 
-						{
-							resolveClient(avatar_name_color,client, this);
-						}
-					}
-					else
-					{
-						// Set your own name to the Imprudence color -- MC
-						avatar_name_color = LLColor4(0.79f,0.44f,0.88f);
+						resolveClient(client_color,client, this);
 					}
 				}
+				else
+				{
+					// Set your own name to the Imprudence color -- MC
+					client_color = LLColor4(0.79f,0.44f,0.88f);
+				}
+				if (gSavedSettings.getBOOL("ShowClientColor"))
+				{
+					avatar_name_color = client_color;
+				}
+				if (!gSavedSettings.getBOOL("ShowClientNameTag"))
+				{
+					client.clear();
+				}
+
 				avatar_name_color.setAlpha(alpha);
 				mNameText->setColor(avatar_name_color);
 				
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 36ed22a..0c32244 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -658,10 +658,11 @@ private:
 	static LLVector3d sBeamLastAt;
 	static LLSD sClientResolutionList;
 
+public: //anything against having this public?
 	static void resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar);
 //Imprudence FIXME
 //	friend class LLFloaterAvatarList;
-
+//	friend class LLHoverView;
 protected:
 	LLPointer<LLHUDEffectSpiral> mBeam;
 	LLFrameTimer mBeamTimer;
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index de34ebd..7528809 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -14,10 +14,24 @@
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Disable teleport screen" left="12" mouse_opaque="true"
 	     name="disable_tp_screen_check" radio_style="false" width="217" />
-  <check_box bottom_delta="-25" enabled="true" follows="left|top"
+   <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
+			font="SansSerifsmall" h_pad="0" halign="left" height="16" left="16"
+			mouse_opaque="true" name="online_no" v_pad="0" width="200">
+   Show client names:
+  </text>
+  <check_box bottom_delta="0" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       label="in nametag" left_delta="100" mouse_opaque="true"
+       name="client_name_tag_check" radio_style="false" width="160" />
+  <check_box bottom_delta="0" enabled="true" follows="left|top"
+       font="SansSerifSmall" height="16" initial_value="false"
+       label="changing nametag color" left_delta="80" mouse_opaque="true"
+       name="client_name_color_check" radio_style="false" width="160" />
+  <check_box bottom_delta="0" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
-       label="Show client names in nametag" left="12" mouse_opaque="true"
-       name="client_name_tag_check" radio_style="false" width="217" />
+       label="in tooltip" left_delta="140" mouse_opaque="true"
+       name="client_name_hover_check" radio_style="false" width="160" />
   <check_box bottom_delta="-18" enabled="true" follows="left|top"
        font="SansSerifSmall" height="16" initial_value="false"
        label="Broadcast your client name to others" left="12" mouse_opaque="true"
-- 
cgit v1.1


From c59ecd1db5830fbf60a6e8de6e05e4e1c82db505 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 30 Jul 2010 14:40:36 +0200
Subject: add checkboxes for MUpose and auto-close OOC to prefs advanced

---
 linden/indra/newview/llprefsadvanced.cpp                   |  5 +++++
 .../skins/default/xui/en-us/panel_preferences_advanced.xml | 14 ++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/linden/indra/newview/llprefsadvanced.cpp b/linden/indra/newview/llprefsadvanced.cpp
index 34c8eb2..60c936a 100644
--- a/linden/indra/newview/llprefsadvanced.cpp
+++ b/linden/indra/newview/llprefsadvanced.cpp
@@ -67,6 +67,9 @@ BOOL LLPrefsAdvanced::postBuild()
 	childSetValue("appearance_anim_check", gSavedSettings.getBOOL("AppearanceAnimate"));
 	childSetValue("legacy_pie_menu_checkbox", gSavedSettings.getBOOL("LegacyPieEnabled"));
 	childSetValue("language_is_public", gSavedSettings.getBOOL("LanguageIsPublic"));
+	childSetValue("allow_mupose", gSavedSettings.getBOOL("AllowMUpose"));
+	childSetValue("auto_close_ooc", gSavedSettings.getBOOL("AutoCloseOOC"));
+
 	childSetValue("lightshare_combo",
 	              LLSD((S32)gSavedSettings.getU32("LightShareAllowed")));
 
@@ -90,6 +93,8 @@ void LLPrefsAdvanced::apply()
 	gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval_spinner").asReal());
 	gSavedSettings.setBOOL("AppearanceAnimate", childGetValue("appearance_anim_check"));
 	gSavedSettings.setBOOL("LanguageIsPublic", childGetValue("language_is_public"));
+	gSavedSettings.setBOOL("AllowMUpose", childGetValue("allow_mupose"));
+	gSavedSettings.setBOOL("AutoCloseOOC", childGetValue("auto_close_ooc"));
 	gSavedSettings.setU32("LightShareAllowed",
 	                      (U32)childGetValue("lightshare_combo").asInteger());
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
index 7528809..ce2bbc1 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
@@ -94,6 +94,20 @@
        mouse_opaque="true" name="language_is_public"
        radio_style="false" tool_tip="This lets in-world objects know your preferred language."
        width="256" />
+
+  <check_box bottom_delta="-25" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+       initial_value="false" label="Use MU* pose style chat and IM" left="12"
+       mouse_opaque="true" name="allow_mupose"
+       radio_style="false" tool_tip="Use MU* pose style in chat and IM (with ':' as a synonymous to '/me ')."
+       width="256" />
+  <check_box bottom_delta="0" enabled="true"
+       follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+       initial_value="false" label="Auto-close OOC chat" left_delta="180"
+       mouse_opaque="true" name="auto_close_ooc"
+       radio_style="false" tool_tip="Auto-close OOC chat (i.e. add )) if not found and (( was used)."
+       width="256" />
+
   <!-- Uncomment when we start using the crash logger - MC -->
   <!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
        bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
-- 
cgit v1.1


From 5d8300e11388681b37f32dfae30c38b54974c40b Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sat, 31 Jul 2010 13:08:05 +0200
Subject: remove llrender/llglimmediate.cpp and llglimmediate.h (empty files).

---
 linden/indra/llrender/llglimmediate.cpp | 1 -
 linden/indra/llrender/llglimmediate.h   | 1 -
 2 files changed, 2 deletions(-)
 delete mode 100644 linden/indra/llrender/llglimmediate.cpp
 delete mode 100644 linden/indra/llrender/llglimmediate.h

diff --git a/linden/indra/llrender/llglimmediate.cpp b/linden/indra/llrender/llglimmediate.cpp
deleted file mode 100644
index 17c2182..0000000
--- a/linden/indra/llrender/llglimmediate.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#error This file has been renamed llrender.cpp
diff --git a/linden/indra/llrender/llglimmediate.h b/linden/indra/llrender/llglimmediate.h
deleted file mode 100644
index 4a7a0eb..0000000
--- a/linden/indra/llrender/llglimmediate.h
+++ /dev/null
@@ -1 +0,0 @@
-#error This file has been renamed llrender.h
-- 
cgit v1.1


From 390c8ccc0e63dd51fb351f1f6d4e67060c303192 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sat, 31 Jul 2010 13:12:44 +0200
Subject: replace llwarns by LL_DEBUGS("View") in llview.h - pointless spam for
 enduser

---
 linden/indra/llui/llview.h                       | 8 ++++----
 linden/indra/newview/app_settings/logcontrol.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index 539adea..7e09dfa 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -488,7 +488,7 @@ public:
 			// did we find *something* with that name?
 			if (child)
 			{
-				llwarns << "Found child named " << name << " but of wrong type " << typeid(child).name() << ", expecting " << typeid(T).name() << llendl;
+				LL_DEBUGS("View") << "Found child named " << name << " but of wrong type " << typeid(child).name() << ", expecting " << typeid(T).name() << LL_ENDL;
 			}
 			if (create_if_missing)
 			{
@@ -515,7 +515,7 @@ public:
 			std::string xml_tag = LLWidgetClassRegistry::getInstance()->getTag<T>();
 			if (xml_tag.empty())
 			{
-				llwarns << "No xml tag registered for this class " << llendl;
+				LL_DEBUGS("View") << "No xml tag registered for this class " << LL_ENDL;
 				return NULL;
 			}
 			// create dummy xml node (<button name="foo"/>)
@@ -526,13 +526,13 @@ public:
 			if (widget)
 			{
 				// need non-const to update private dummy widget cache
-				llwarns << "Making dummy " << xml_tag << " named " << name << " in " << getName() << llendl;
+				LL_DEBUGS("View") << "Making dummy " << xml_tag << " named " << name << " in " << getName() << LL_ENDL;
 				mDummyWidgets.insert(std::make_pair(name, widget));
 			}
 			else
 			{
 				// dynamic cast will fail if T::fromXML only registered for base class
-				llwarns << "Failed to create dummy widget of requested type " << llendl;
+				LL_DEBUGS("View") << "Failed to create dummy widget of requested type " << LL_ENDL;
 				return NULL;
 			}
 		}
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index 281cc38..f92f6ff 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -69,7 +69,7 @@
 							<!--<string>Openjpeg</string>-->
 							<!--<string>RLV</string>-->
 							<!--<string>VOAvatar</string>-->
-
+							<!--<string>View</string>-->
 							<!--<string>ViewerImages</string>-->
 							<!--<string>Throttle</string>-->
 							<!--<string>Voice</string>-->
-- 
cgit v1.1


From aae5430ef724236dec20622247b7bd2d7c7e84ff Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sat, 31 Jul 2010 13:36:46 +0200
Subject: move llwarns ... "Grav SET to" ... to LL_DEBUGS("BodyPhysics")

---
 linden/indra/newview/app_settings/logcontrol.xml | 1 +
 linden/indra/newview/llvoavatar.cpp              | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index f92f6ff..cff9a56 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -50,6 +50,7 @@
               <!--<string>AppCache</string>-->
 							<!--<string>APR</string>-->
 							<!--<string>AudioEngine</string>-->
+							<!--<string>BodyPhysics</string>-->
               <!--<string>InitInfo</string>-->
               <!--<string>isOwnedSelf</string>-->
 							<!--<string>HUDEffect</string>-->
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 53962a9..2732d48 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -8560,17 +8560,17 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
 
 				if(param->getID() == 507 && newWeight != getActualBoobGrav())
 				{
-					llwarns << "Boob Grav SET to " << newWeight << " for " << getFullname() << llendl;
+					LL_DEBUGS("BodyPhysics")<< "Boob Grav SET to " << newWeight << " for " << getFullname() << LL_ENDL;
 					setActualBoobGrav(newWeight);
 				}
 				if(param->getID() == 795 && newWeight != getActualButtGrav())
 				{
-					llwarns << "Butt Grav SET to " << newWeight << " for " << getFullname() << llendl;
+					LL_DEBUGS("BodyPhysics")<< "Butt Grav SET to " << newWeight << " for " << getFullname() << LL_ENDL;
 					setActualButtGrav(newWeight);
 				}
 				if(param->getID() == 157 && newWeight != getActualFatGrav())
 				{
-					llwarns << "Fat Grav SET to " << newWeight << " for " << getFullname() << llendl;
+					LL_DEBUGS("BodyPhysics")<< "Fat Grav SET to " << newWeight << " for " << getFullname() << LL_ENDL;
 					setActualFatGrav(newWeight);
 				}
 
-- 
cgit v1.1


From 28191a5ef2ec06e0e9bd02a7f162dbea9ae47674 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 1 Aug 2010 21:44:34 -0500
Subject: Disable AllowMUpose and AutoCloseOOC by default.

They can make chat seem broken/weird if the user does not expect them.

(Also moved the settings to the Imprudence section of settings.xml.)
---
 linden/indra/newview/app_settings/settings.xml | 48 ++++++++++++--------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index dcbda36..c144f95 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4,6 +4,28 @@
   
   <!-- Imprudence-specific settings -->
 
+  <key>AllowMUpose</key>
+  <map>
+    <key>Comment</key>
+    <string>Allow MU* pose style in chat and IM (':' works like '/me ')</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>AutoCloseOOC</key>
+  <map>
+    <key>Comment</key>
+    <string>Auto-close OOC chat (i.e. add \"))\" if not found and \"((\" was used)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>AppearanceAnimate</key>
   <map>
     <key>Comment</key>
@@ -1359,32 +1381,6 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-
-    <!-- Begin: MUpose -->
-    <key>AllowMUpose</key>
-    <map>
-      <key>Comment</key>
-      <string>Allow MU* pose style in chat and IM (with ':' as a synonymous to '/me ')</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>AutoCloseOOC</key>
-    <map>
-      <key>Comment</key>
-      <string>Auto-close OOC chat (i.e. add \"))\" if not found and \"((\" was used)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <!-- End: MUpose -->
-
   <key>AllowIdleAFK</key>
   <map>
     <key>Comment</key>
-- 
cgit v1.1


From 6e41e9640800154afdf361bee4428e2eb5354508 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 1 Aug 2010 22:13:26 -0500
Subject: Fixed llfilepicker.cpp to use the right translation string for .raw
 files.

---
 linden/indra/newview/llfilepicker.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index d953e45..40b1abb 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -1177,7 +1177,7 @@ BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename
 			break;
 		case FFSAVE_RAW:
 			caption += add_simple_pattern_filter_to_gtkchooser
-				(picker, "*.raw", LLTrans::getString("raw_file") + " (*.raw)");
+				(picker, "*.raw", LLTrans::getString("dot_raw_file") + " (*.raw)");
 			suggest_ext = ".raw";
 			break;
 		case FFSAVE_J2C:
-- 
cgit v1.1


From 553a35d3ff586335ca4d1dd911e9180541361e9b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 1 Aug 2010 15:33:18 -0700
Subject: Added loading kdu debugging info to the log

---
 linden/indra/llimage/llimagej2c.cpp              | 13 +++++++------
 linden/indra/newview/app_settings/logcontrol.xml |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/linden/indra/llimage/llimagej2c.cpp b/linden/indra/llimage/llimagej2c.cpp
index 5480c88..b99ebff 100644
--- a/linden/indra/llimage/llimagej2c.cpp
+++ b/linden/indra/llimage/llimagej2c.cpp
@@ -122,6 +122,7 @@ void LLImageJ2C::openDSO()
 					j2cimpl_destroy_func = dest_func;
 					j2cimpl_engineinfo_func = engineinfo_func;
 					all_functions_loaded = true;
+					LL_INFOS("LLKDU") << "Optional J2C renderer " << dso_name << " found at " << dso_path << LL_ENDL;
 				}
 			}
 		}
@@ -132,17 +133,17 @@ void LLImageJ2C::openDSO()
 		//something went wrong with the DSO or function loading..
 		//fall back onto our satefy impl creation function
 
-#if 0
 		// precious verbose debugging, sadly we can't use our
 		// 'llinfos' stream etc. this early in the initialisation seq.
+		// Want to bet? -- MC
+		if (dso_path.empty()) dso_path = "not found";
 		char errbuf[256];
-		fprintf(stderr, "failed to load syms from DSO %s (%s)\n",
-			dso_name.c_str(), dso_path.c_str());
+		LL_INFOS("LLKDU") << "failed to load syms from optional DSO " << dso_name 
+			<< " (" << dso_path << ")" << LL_ENDL;
 		apr_strerror(rv, errbuf, sizeof(errbuf));
-		fprintf(stderr, "error: %d, %s\n", rv, errbuf);
+		LL_INFOS("LLKDU") << "error: " << rv << ", " << errbuf << LL_ENDL;
 		apr_dso_error(j2cimpl_dso_handle, errbuf, sizeof(errbuf));
-		fprintf(stderr, "dso-error: %d, %s\n", rv, errbuf);
-#endif
+		LL_INFOS("LLKDU") << "dso-error: " << rv << ", " << errbuf << LL_ENDL;
 
 		if ( j2cimpl_dso_handle )
 		{
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index cff9a56..4d3288f 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -20,6 +20,7 @@
 					<key>tags</key>
 						<array>
 							<string>AppInit</string>
+              <string>LLKDU</string>
 							<string>SystemInfo</string>
 							<string>TextureCache</string>
 							<string>AppCache</string>
-- 
cgit v1.1