22 files changed, 831 insertions, 1221 deletions
diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index e379192..9752c22 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -1,11 +1,11 @@
-/** 
+/**
 * @file lscript_library.cpp
 * @brief external library interface
 *
 * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
+ *
 * Copyright (c) 2002-2009, Linden Research, Inc.
- * 
+ *
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
 * online at http://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
@@ -37,7 +37,7 @@
 //  ##  ##  ## ##     ## ########  ## ## ##  ##  ## ## ## ##   ####  ##   ##
 //  ##  ##  ## ######### ##   ##   ##  ####  ##  ##  #### ##    ##
 //  ##  ##  ## ##     ## ##    ##  ##   ###  ##  ##   ### ##    ##  #### ####
-//   ###  ###  ##     ## ##     ## ##    ## #### ##    ##  ######   #### #### 
+//   ###  ###  ##     ## ##     ## ##    ## #### ##    ##  ######   #### ####
 //
 // When adding functions, they <b>MUST</b> be appended to the end of
 // the init() method. The init() associates the name with a number,
@@ -335,7 +335,7 @@ void LLScriptLibrary::init()
        addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetRemoteScriptAccessPin", NULL, "i", "llSetRemoteScriptAccessPin(integer pin)\nIf pin is set to a non-zero number, the task will accept remote script\nloads via llRemoteLoadScriptPin if it passes in the correct pin.\nOthersise, llRemoteLoadScriptPin is ignored."));
        addFunction(new LLScriptLibraryFunction(10.f, 3.f, dummy_func, "llRemoteLoadScriptPin", NULL, "ksiii", "llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param)\nIf the owner of the object this script is attached can modify target,\nthey are in the same region,\nand the matching pin is used,\ncopy script name onto target,\nif running == TRUE, start the script with param."));
-        
        addFunction(new LLScriptLibraryFunction(10.f, 1.f, dummy_func, "llOpenRemoteDataChannel", NULL, NULL, "llOpenRemoteDataChannel()\nCreates a channel to listen for XML-RPC calls.  Will trigger a remote_data event with channel id once it is available."));
        addFunction(new LLScriptLibraryFunction(10.f, 3.f, dummy_func, "llSendRemoteData", "k", "ksis", "key llSendRemoteData(key channel, string dest, integer idata, string sdata)\nSend an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata.\nA message identifier key is returned.\nAn XML-RPC reply will trigger a remote_data event and reference the message id.\nThe message_id is returned."));
        addFunction(new LLScriptLibraryFunction(10.f, 3.f, dummy_func, "llRemoteDataReply", NULL, "kksi", "llRemoteDataReply(key channel, key message_id, string sdata, integer idata)\nSend an XML-RPC reply to message_id on channel with payload of string sdata and integer idata"));
@@ -351,7 +351,7 @@ void LLScriptLibrary::init()
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llLog", "f", "f", "float llLog(float val)\nReturns the base e log of val if val > 0, otherwise returns 0."));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetAnimationList", "l", "k", "list llGetAnimationList(key id)\nGets a list of all playing animations for avatar id"));
        addFunction(new LLScriptLibraryFunction(10.f, 2.f, dummy_func, "llSetParcelMusicURL", NULL, "s", "llSetParcelMusicURL(string url)\nSets the streaming audio URL for the parcel object is on"));
-        
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetRootPosition", "v", NULL, "vector llGetRootPosition()\nGets the global position of the root object of the object script is attached to"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetRootRotation", "q", NULL, "rotation llGetRootRotation()\nGets the global rotation of the root object of the object script is attached to"));
@@ -370,7 +370,7 @@ void LLScriptLibrary::init()
        addFunction(new LLScriptLibraryFunction(10.f, 0.0f, dummy_func, "llBase64ToInteger", "i", "s", "integer llBase64ToInteger(string str)\nBig endian decode of a Base64 string into an integer."));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetGMTclock", "f", "", "float llGetGMTclock()\nGets the time in seconds since midnight in GMT"));
        addFunction(new LLScriptLibraryFunction(10.f, 10.f, dummy_func, "llGetSimulatorHostname", "s", "", "string llGetSimulatorHostname()\nGets the hostname of the machine script is running on (same as string in viewer Help dialog)"));
-        
        addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLocalRot", NULL, "q", "llSetLocalRot(rotation rot)\nsets the rotation of a child prim relative to the root prim"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llParseStringKeepNulls", "l", "sll", "list llParseStringKeepNulls(string src, list separators, list spacers)\nBreaks src into a list, discarding separators, keeping spacers (separators and spacers must be lists of strings, maximum of 8 each), keeping any null values generated."));
@@ -393,12 +393,12 @@ void LLScriptLibrary::init()
        addFunction(new LLScriptLibraryFunction(10.f, 2.f, dummy_func, "llParcelMediaQuery", "l", "l", "list llParcelMediaQuery(list query)\nSends a list of queries, returns a list of results."));
        addFunction(new LLScriptLibraryFunction(10.f, 1.f, dummy_func, "llModPow", "i", "iii", "integer llModPow(integer a, integer b, integer c)\nReturns a raised to the b power, mod c. ( (a**b)%c ).  b is capped at 0xFFFF (16 bits)."));
-        
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetInventoryType", "i", "s", "integer llGetInventoryType(string name)\nReturns the type of the inventory name"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetPayPrice", NULL, "il", "llSetPayPrice(integer price, list quick_pay_buttons)\nSets the default amount when someone chooses to pay this object."));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetCameraPos", "v", "", "vector llGetCameraPos()\nGets current camera position for agent task has permissions for."));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetCameraRot", "q", "", "rotation llGetCameraRot()\nGets current camera orientation for agent task has permissions for."));
-        
        addFunction(new LLScriptLibraryFunction(10.f, 20.f, dummy_func, "llSetPrimURL", NULL, "s", "llSetPrimURL(string url)\nUpdates the URL for the web page shown on the sides of the object."));
        addFunction(new LLScriptLibraryFunction(10.f, 20.f, dummy_func, "llRefreshPrimURL", NULL, "", "llRefreshPrimURL()\nReloads the web page shown on the sides of the object."));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llEscapeURL", "s", "s", "string llEscapeURL(string url)\nReturns and escaped/encoded version of url, replacing spaces with %20 etc."));
@@ -411,7 +411,7 @@ void LLScriptLibrary::init()
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCameraParams",                      NULL, "l", "llSetCameraParams(list rules)\nSets multiple camera parameters at once.\nList format is [ rule1, data1, rule2, data2 . . . rulen, datan ]"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llClearCameraParams",            NULL, NULL, "llClearCameraParams()\nResets all camera parameters to default values and turns off scripted camera control."));
-        
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llListStatistics", "f", "il", "float llListStatistics(integer operation, list l)\nPerform statistical aggregate functions on list l using LIST_STAT_* operations."));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetUnixTime", "i", NULL, "integer llGetUnixTime()\nGet the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock."));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetParcelFlags", "i", "v", "integer llGetParcelFlags(vector pos)\nGet the parcel flags (PARCEL_FLAG_*) for the parcel including the point pos."));
@@ -433,7 +433,7 @@ void LLScriptLibrary::init()
        addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLinkPrimitiveParams", NULL, "il", "llSetLinkPrimitiveParams(integer linknumber, list rules)\nSet primitive parameters for linknumber based on rules."));
        addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLinkTexture", NULL, "isi", "llSetLinkTexture(integer link_pos, string texture, integer face)\nSets the texture of face for link_pos"));
-        
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llStringTrim", "s", "si", "string llStringTrim(string src, integer trim_type)\nTrim leading and/or trailing spaces from a string.\nUses trim_type of STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL."));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llRegionSay", NULL, "is", "llRegionSay(integer channel, string msg)\nbroadcasts msg to entire region on channel (not 0.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetObjectDetails", "l", "kl", "list llGetObjectDetails(key id, list params)\nGets the object details specified in params for the object with key id.\nDetails are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR."));
@@ -484,25 +484,25 @@ void LLScriptLibrary::init()
        // documented and therefore the description may be incomplete and require further attention.
        // OpenSimulator is written in C# and not CPP therefore some values for example "double = float" etc. are different.
-        // OSSL corrections and syntax additions added + set in same order as found in OSSL_stub.cs of OpenSim Source (Updated PM October-21-2010 
+        // OSSL corrections and syntax additions added + set in same order as found in OSSL_stub.cs of OpenSim Source (Updated PM October-21-2010
-        // based on OpenSimulator Ver. 0.7.x DEV/Master Git # a7acb650d400a280a7b9edabd304376dff9c81af - a7acb65-r/14142 
+        // based on OpenSimulator Ver. 0.7.x DEV/Master Git # a7acb650d400a280a7b9edabd304376dff9c81af - a7acb65-r/14142
-        // Updates by WhiteStar Magic 
+        // Updates by WhiteStar Magic
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetRegionWaterHeight", NULL, "f", "osSetRegionWaterHeight(float height)\nAdjusts Water Height on region.\n(OpenSim only.)")); 
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetRegionWaterHeight", NULL, "f", "osSetRegionWaterHeight(float height)\nAdjusts Water Height on region.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetRegionSunSettings", NULL, "iif", "osSetRegionSunSettings(integer useEstateSun, integer sunFixed, float sunHour)\nChanges the Estate Sun Settings, then Triggers a Sun Update\n'sunFixed' TRUE (1) to keep the sun stationary, FALSE (0) to use global time\n'sunHour' The \"Sun Hour\" that is desired, 0...24, with 0 just after SunRise.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetEstateSunSettings", NULL, "if", "osSetEstateSunSettings(integer sunFixed, float sunHour)\nsunFixed = 0 or 1, sunHour = 00.00 to 24.00.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetCurrentSunHour", "f", NULL, "float osGetCurrentSunHour()\nReturns Float Value of Current Sun Hour 0...24 0 = sunrise.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSunGetParam","f", "s", "float osSunGetParam(string param)\nReturns current float values for param\nwhere param = day_length, year_length, day_night_offset, update_interval.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSunSetParam", "sf", NULL, "osSunSetParam(string param, float value)\nSet's Sun Param for SunSet,\nosSunSetParam(day_length, 24.0)\nwhere param = day_length, year_length, day_night_offset, update_interval.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindActiveModelPluginName", "s", NULL, "string osWindActiveModelPluginName()\nReturns the Current Working Wind Module Installed\nThese are SimpleRandomWind or ConfigurableWind, optionally others.\n(OpenSim only.)"));
-    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelJoin", NULL, "vv", "osParcelJoin(vector pos1, vector pos2))\nJoins Parcels @ X,Y coordinates.\n(OpenSim only.)"));   
+    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelJoin", NULL, "vv", "osParcelJoin(vector pos1, vector pos2))\nJoins Parcels @ X,Y coordinates.\n(OpenSim only.)"));
-    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSubdivide", NULL, "vv", "osParcelSubdivide(vector pos1, vector pos2))\nSubdivides Parcels @ X,Y coordinates.\n(OpenSim only.)"));    
+    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSubdivide", NULL, "vv", "osParcelSubdivide(vector pos1, vector pos2))\nSubdivides Parcels @ X,Y coordinates.\n(OpenSim only.)"));
-    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSetDetails", NULL, "vv", "osParcelSetDetails(vector pos, list rules))\nSet Parcel details.\n(OpenSim only.)"));      
+    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSetDetails", NULL, "vv", "osParcelSetDetails(vector pos, list rules))\nSet Parcel details.\n(OpenSim only.)"));
-        // addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamSet", NULL, "ssf", "osWindParamSet(string plugin, string param, float value)Send Param to Specified Wind Plugin with new value.\n(OpenSim only.)")); 
+        // addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamSet", NULL, "ssf", "osWindParamSet(string plugin, string param, float value)Send Param to Specified Wind Plugin with new value.\n(OpenSim only.)"));
-        // addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamGet", "f", "ss", "float osWindParamGet(string plugin, string param)\n Returns Current param from specified Wind Plugin Module.\n(OpenSim only.)")); 
+        // addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamGet", "f", "ss", "float osWindParamGet(string plugin, string param)\n Returns Current param from specified Wind Plugin Module.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osList2Double", "f", "si", "double osList2Double(list src, int index)\nReturns Double (float) Value from src at index.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURL", NULL, "ssssi", "osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer )\n(OpenSim only.)"));
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureData", NULL, "ssssi", "osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer)\nWrites text and vector graphics onto a prim face.\n(OpenSim only.)"));     
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureData", NULL, "ssssi", "osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer)\nWrites text and vector graphics onto a prim face.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURLBlend", NULL, "ssssii", "osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, int timer, int alpha)\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureDataBlend", NULL, "ssssii", "osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams, int timer, int alpha)\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURLBlendFace", NULL, "ssssfiiii", "osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, bool blend, int disp, int timer, int alpha, int face)\nLoads a web texture on a prim.\n(OpenSim only.)"));
@@ -512,7 +512,7 @@ void LLScriptLibrary::init()
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osTerrainFlush", NULL, NULL, "osTerrainFlush()\nUpdates terrain data. Call this after you are done using osTerrainSetHeight.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osRegionRestart", NULL, "f", "int osRegionRestart(double seconds)\nRestart the current region in the specified number of seconds from now.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osRegionNotice",NULL, "s", "osRegionNotice(string msg)\nBroadcasts a notification message to all agents on the current region.\n(OpenSim only.)"));
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osConsoleCommand", NULL, "s", "osConsoleCommand(string command)\nIssues commands directly to the OpenSim server console.\n(OpenSim only.)"));   
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osConsoleCommand", NULL, "s", "osConsoleCommand(string command)\nIssues commands directly to the OpenSim server console.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetParcelMediaURL", NULL, "s", "osSetParcelMediaURL(string url)\nSets Parcel Media URL.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetParcelSIPAddress", NULL, "s", "osSetParcelSIPAddress(string SIPAddress)\nSets Parcel SIP Address for Voice.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimFloatOnWater", NULL, "i", "osSetPrimFloatOnWater(int floatYN)\nMake Physical prims float at the water level, TRUE or FALSE.\n(OpenSim only.)"));
@@ -568,10 +568,10 @@ void LLScriptLibrary::init()
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetSpeed", NULL, "kf", "osSetSpeed(key AVATAR, float SpeedModifier)\nMultiplies the normal running, walking, and flying speed of the specified avatar.\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osCauseDamage", NULL, "kf", "osCauseDamage(key AVATAR, float damage)\nCauses damage to specified AVATAR (UUID).\n(OpenSim only.)"));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osCauseHealing", NULL, "kf", "osCauseHealing(key AVATAR, float healing)\nCauses Healing to specified AVATAR (UUID).\n(OpenSim only.)"));
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetPrimitiveParams", "l", "kl", "List osGetPrimitiveParams(key prim, list rules)\nGets primitive Params.\n(OpenSim only.)")); 
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetPrimitiveParams", "l", "kl", "List osGetPrimitiveParams(key prim, list rules)\nGets primitive Params.\n(OpenSim only.)"));
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimitiveParams", NULL, "kl", "osSetPrimitiveParams(key prim, list rules)\nSets primitive Params.\n(OpenSim only.)")); 
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimitiveParams", NULL, "kl", "osSetPrimitiveParams(key prim, list rules)\nSets primitive Params.\n(OpenSim only.)"));
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetProjectionParams", NULL, "kikfff", "osSetProjectionParams(key prim. bool projection, key texture, float fov, float focus, float amb)\nSet Projection Paramaters (bool = true / false)\n(OpenSim only.)")); 
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetProjectionParams", NULL, "kikfff", "osSetProjectionParams(key prim. bool projection, key texture, float fov, float focus, float amb)\nSet Projection Paramaters (bool = true / false)\n(OpenSim only.)"));
-        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osUnixTimeToTimestamp", "s", "i", "osUnixTimeToTimestamp(integer unixtime)\nConverts unixtime to an llGetTimeStamp() formated string.\n(OpenSim only.)")); 
+        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osUnixTimeToTimestamp", "s", "i", "osUnixTimeToTimestamp(integer unixtime)\nConverts unixtime to an llGetTimeStamp() formated string.\n(OpenSim only.)"));
        // LightShare functions
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "cmSetWindlightScene", "i", "l", "integer cmSetWindlightScene(list rules)\nSet the current WindLight scene. Restricted to estate managers and owners only."));
@@ -579,6 +579,7 @@ void LLScriptLibrary::init()
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "cmGetWindlightScene", "l", "l", "list cmGetWindlightScene(list rules)\nGet the current WindLight settings."));
        // LightShare functions - alternate versions
        // don't ask me why they renamed 'em, but we need to include both versions -- MC
+        // cm refers to a proprietary fork of OpenSim used by Meta 7 and Avination, they where renamed to ls when LightShare was released to the wild.
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "lsSetWindlightScene", "i", "l", "integer lsSetWindlightScene(list rules)\nSet the current WindLight scene. Restricted to estate managers and owners only."));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "lsSetWindlightSceneTargeted", "i", "lk", "integer lsSetWindlightSceneTargeted(list rules, key target)\nSet the current WindLight scene directed to a specific avatar. Restricted to estate managers and owners only."));
        addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "lsGetWindlightScene", "l", "l", "list lsGetWindlightScene(list rules)\nGet the current WindLight settings."));
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index a875564..1fc5f42 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -92,7 +92,7 @@ set(viewer_SOURCE_FILES
    jcfloaterareasearch.cpp
    kokuastreamingaudio.cpp
    kowopenregionsettings.cpp
-    lightshare.cpp
+    llettherebelight.cpp
    llagent.cpp
    llagentaccess.cpp
    llagentdata.cpp
@@ -504,11 +504,9 @@ set(viewer_SOURCE_FILES
    slfloatermediafilter.cpp
    viewerinfo.cpp
    viewertime.cpp
-    windlightsettingsupdate.cpp
    wlfloatermanager.cpp
    wlfloaterwindlightsend.cpp
    wlretrievesettings.cpp
-    wlsettingsmanager.cpp
    rcmoapradar.cpp
    )
@@ -533,7 +531,7 @@ set(viewer_HEADER_FILES
    CMakeLists.txt
    ViewerInstall.cmake
    aoremotectrl.h
-        chatbar_as_cmdline.h
+    chatbar_as_cmdline.h
    emeraldboobutils.h
    floaterao.h
    floaterbusy.h
@@ -552,11 +550,11 @@ set(viewer_HEADER_FILES
    jcfloater_animation_list.h
    jcfloaterareasearch.h
    kokuastreamingaudio.h
-    lightshare.h
+    llettherebelight.h
-        lggautocorrectfloater.h
+    lggautocorrectfloater.h
-        lggautocorrect.h
+    lggautocorrect.h
-        lggdicdownload.h
+    lggdicdownload.h
-        lgghunspell_wrapper.h
+    lgghunspell_wrapper.h
    llagent.h
    llagentaccess.h
    llagentdata.h
@@ -739,7 +737,7 @@ set(viewer_HEADER_FILES
    llmaniprotate.h
    llmanipscale.h
    llmaniptranslate.h
-        llmediadataclient.h
+    llmediadataclient.h
    llmapresponders.h
    llmediaremotectrl.h
    llmemoryview.h
@@ -983,8 +981,7 @@ set(viewer_HEADER_FILES
    wlfloatermanager.h
    wlfloaterwindlightsend.h
    wlretrievesettings.h
-    wlsettingsmanager.h
+    rcmoapradar.h
-        rcmoapradar.h
    )
 source_group("CMake Rules" FILES ViewerInstall.cmake)
diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/llettherebelight.cpp
index b00df96..7fc2a3d 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/llettherebelight.cpp
@@ -1,9 +1,10 @@
 /**
- * @file lightshare.cpp
+ * @file llettherebelight.cpp
- * @brief Handler for Meta7 Lightshare (region-side Windlight settings).
+ * @brief Handler for Meta7 Lightshare (region-side Windlight settings), and other methods of sharing WindLight.
 *
 * Copyright (c) 2010, Tom Grimshaw (Tom Meta)
 * Copyright (c) 2010, Jacek Antonelli
+ * Copyright (c) 2012, David Seikel
 *
 * The source code in this file ("Source Code") is provided to you
 * under the terms of the GNU General Public License, version 2.0
@@ -27,7 +28,6 @@
 */
-#include "lightshare.h"
 #include "linden_common.h"
 #include "llviewercontrol.h"
@@ -38,21 +38,26 @@
 #include "message.h"
 #include "meta7windlight.h"
+#include "llettherebelight.h"
-const std::string WindlightMessage::sWaterPresetName = "(Region settings)";
+#include "llagent.h"
-const std::string WindlightMessage::sSkyPresetName   = "(Region settings)";
+#include "llworld.h"
-WindlightMessage* WindlightMessage::sMostRecent = NULL;
+const std::string LightShare::sRegionPresetName = "(Region settings)";
-LLTimer* WindlightMessage::sIgnoreTimer = new LLTimer();
+const std::string LightShare::sParcelPresetName = "(Parcel settings)";
-bool WindlightMessage::sIgnoreRegion = false;
+const std::string LightShare::sRLVPresetName = "(RLV settings)";
-WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
+LLWaterParamSet* LightShare::mWater = NULL;
+LLWLParamSet* LightShare::mSky = NULL;
+LLUUID* LightShare::mWaterNormal = NULL;
+LLTimer* LightShare::sIgnoreTimer = new LLTimer();
+bool LightShare::sIgnoreRegion = false;
+LightShare::LightShare( LLMessageSystem* msg ) :
        mPacket(NULL),
-        mWater(NULL),
-        mSky(NULL),
-        mWaterNormal(NULL),
        mIsValid(false)
 {
        std::string method;
@@ -77,10 +82,7 @@ WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
                                 buf, size, 0, 249);
        mWater = new LLWaterParamSet();
-//      mSky = new LLWLParamSet();
+        mSky = new LLWLParamSet();
-        LLWLParamManager * wl_param_mgr = LLWLParamManager::instance();
-        static LLWLParamSet & sSky = wl_param_mgr->mCurParams;
-        mSky = &sSky;
        mWaterNormal = new LLUUID();
@@ -93,21 +95,21 @@ WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
 }
-WindlightMessage::~WindlightMessage()
+LightShare::~LightShare()
 {
        delete mWater;
-//      delete mSky;
+        delete mSky;
        delete mWaterNormal;
 }
 // static
-void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
+void LightShare::processWindlight(LLMessageSystem* msg, void**)
 {
        if( gSavedSettings.getU32("LightShareAllowed") <= LIGHTSHARE_NEVER )
                return;
-        WindlightMessage* wl = new WindlightMessage(msg);
+        LightShare* wl = new LightShare(msg);
        if (!wl)
                return;
@@ -118,16 +120,28 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
                return;
        }
+        applyMaybe(wl->mWater, wl->mWaterNormal, wl->mSky);
+}
+//static
+void LightShare::applyMaybe(LLWaterParamSet* thisWater, LLUUID* thisWaterNormal, LLWLParamSet* thisSky)
+{
+        if( gSavedSettings.getU32("LightShareAllowed") <= LIGHTSHARE_NEVER )
+                return;
        std::string water = LLWaterParamManager::instance()->mCurParams.mName;
        std::string sky = LLWLParamManager::instance()->mCurParams.mName;
        // If they are using region settings already, or LightShare is
        // always allowed, just apply the new settings, don't bother asking.
        if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ALWAYS ||
-            (sky == sSkyPresetName && water == sWaterPresetName) )
+            (sky == sRegionPresetName && water == sRegionPresetName) )
        {
-                wl->apply();
+                mSky = thisSky;
-                delete wl;
+                mWater = thisWater;
+                mWaterNormal = thisWaterNormal;
+                apply(mWater, mWaterNormal, mSky, WL_SCOPE_REGION);
                return;
        }
@@ -136,41 +150,36 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
                // The user recently ignored a windlight message, so ignore
                // this one too, and restart the timer.
                restartIgnoreTimer();
-                delete wl;
                return;
        }
        if(sIgnoreRegion)
        {
                // We are ignoring new settings until user enters a new region.
-                delete wl;
                return;
        }
-        if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ASK &&
+        if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ASK && mSky == NULL && mWater == NULL)
-            sMostRecent == NULL )
        {
                // No most recent, so store this and create notification
                // asking the user whether to apply or not.
-                sMostRecent = wl;
+                mSky = thisSky;
-                LLNotifications::instance().add("ConfirmLightShare", LLSD(), LLSD(), 
+                mWater = thisWater;
+                mWaterNormal = thisWaterNormal;
+                LLNotifications::instance().add("ConfirmLightShare", LLSD(), LLSD(),
                                                boost::bind(&applyCallback, _1, _2));
-                return;
        }
        else
        {
-                // No new notification (to avoid spamming the user), just
+                // No new notification (to avoid spamming the user, we do keep the saves from above)
-                // store this as most recent.
+                mSky = thisSky;
-                delete sMostRecent;
+                mWater = thisWater;
-                sMostRecent = wl;
+                mWaterNormal = thisWaterNormal;
-                return;
        }
 }
 // static
-bool WindlightMessage::applyCallback(const LLSD& notification,
+bool LightShare::applyCallback(const LLSD& notification, const LLSD& response)
-                                     const LLSD& response)
 {
        S32 option = LLNotification::getSelectedOption(notification, response);
@@ -178,7 +187,8 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
        {
                case 0:{
                        // "Apply"
-                        sMostRecent->apply();
+                        apply(mWater, mWaterNormal, mSky, WL_SCOPE_REGION);
                        break;
                }
                case 1:{
@@ -193,22 +203,18 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
                }
        }
-        delete sMostRecent;
-        sMostRecent = NULL;
        return false;
 }
 // static
-void WindlightMessage::resetRegion()
+void LightShare::resetRegion()
 {
        sIgnoreRegion = false;
+        apply(NULL, NULL, NULL, WL_SCOPE_REGION);
 }
 // static
-void WindlightMessage::restartIgnoreTimer()
+void LightShare::restartIgnoreTimer()
 {
        F32 time = gSavedSettings.getF32("LightShareIgnoreTimer");
        sIgnoreTimer->start();
@@ -216,51 +222,219 @@ void WindlightMessage::restartIgnoreTimer()
 }
 // static
-bool WindlightMessage::ignoreTimerHasExpired()
+bool LightShare::ignoreTimerHasExpired()
 {
        return sIgnoreTimer->hasExpired();
 }
+// TODO - have regionSet and parcelSet be arrays, so we can deal with height zones.
+static struct WLCombined userSet, regionSet, parcelSet, RLVSet;
-bool WindlightMessage::apply()
+// TODO - should spread this merging stuff around,
+//        so that eventually we can get rid of almost identical code for water and sky.
+//        Then one of these two methods goes away.
+//static
+void LightShare::mergeWaterSets(LLWaterParamSet* thisSet, LLWaterParamSet* oldSet)
 {
-        LLWaterParamManager* water_mgr = LLWaterParamManager::instance();
+        for(LLSD::map_const_iterator i = thisSet->mParamValues.beginMap();
-        LLWLParamManager* sky_mgr = LLWLParamManager::instance();
+                i != thisSet->mParamValues.endMap();
+                ++i)
-        mWater->mName = sWaterPresetName;
+        {
-        water_mgr->removeParamSet( sWaterPresetName, false );
+                const std::string& param = i->first;
-        water_mgr->addParamSet( sWaterPresetName, *mWater );
-        water_mgr->savePreset( sWaterPresetName );
+                if(i->second.isArray())
-        water_mgr->loadPreset( sWaterPresetName, true );
+                {
-        water_mgr->setNormalMapID( *mWaterNormal );
+                        for (int j = 0; j < i->second.size(); j++)
+                        {
-        mSky->mName = sSkyPresetName;
+                                oldSet->mParamValues[param][j] = i->second[j].asReal();
-        sky_mgr->mAnimator.mIsRunning = false;
+                        }
-        sky_mgr->mAnimator.mUseLindenTime = false;
+                }
-        sky_mgr->removeParamSet( sSkyPresetName, false );
+                else if(i->second.isReal())
-        sky_mgr->addParamSet( sSkyPresetName, *mSky );
+                  oldSet->mParamValues[param] = i->second.asReal();
-        sky_mgr->savePreset( sSkyPresetName );
+        }
-        sky_mgr->loadPreset( sSkyPresetName, true );
-        return true;
 }
+//static
+void LightShare::mergeWLSets(LLWLParamSet* thisSet, LLWLParamSet* oldSet)
+{
+        for(LLSD::map_const_iterator i = thisSet->mParamValues.beginMap();
+                i != thisSet->mParamValues.endMap();
+                ++i)
+        {
+                const std::string& param = i->first;
+                if(i->second.isArray())
+                {
+                        for (int j = 0; j < i->second.size(); j++)
+                        {
+                                oldSet->mParamValues[param][j] = i->second[j].asReal();
+                        }
+                }
+                else if(i->second.isReal())
+                  oldSet->mParamValues[param] = i->second.asReal();
+        }
+}
-bool WindlightMessage::isValid()
+//static
+void LightShare::apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky, WLScope scope)
+// TODO - Deal with day cycle stuff.
 {
-        return mIsValid;
+        LLWaterParamManager* waterMgr = LLWaterParamManager::instance();
+        LLWLParamManager* skyMgr = LLWLParamManager::instance();
+        LLWaterParamSet oldWaterSet = waterMgr->mCurParams;
+        LLWLParamSet oldWLSet = skyMgr->mCurParams;
+        struct WLCombined* thisSet = &userSet;
+        bool user = true;
+        switch(scope)
+        {
+                case WL_SCOPE_USER :
+                {
+                        thisSet = &userSet;
+                        thisSet->water.mName = waterMgr->mCurParams.mName;
+                        thisSet->sky.mName = skyMgr->mCurParams.mName;
+                        thisSet->enabled = true;
+                        // Check if user selected to show the saved region or parcel settings.
+                        if (newSky && (sRegionPresetName == skyMgr->mCurParams.mName))
+                          thisSet->enabled = false;
+                        if (newWater && (sParcelPresetName == skyMgr->mCurParams.mName))
+                          thisSet->enabled = false;
+                        break;
+                }
+                case WL_SCOPE_REGION :
+                {
+                        thisSet = &regionSet;
+                        thisSet->water.mName = sRegionPresetName;
+                        thisSet->sky.mName = sRegionPresetName;
+                        thisSet->enabled = (gSavedSettings.getU32("LightShareAllowed") != LIGHTSHARE_NEVER);
+                        break;
+                }
+                case WL_SCOPE_PARCEL :
+                {
+                        thisSet = &parcelSet;
+                        thisSet->water.mName = sParcelPresetName;
+                        thisSet->sky.mName = sParcelPresetName;
+                        thisSet->enabled = (gSavedSettings.getU32("LightShareAllowed") != LIGHTSHARE_NEVER);
+                        break;
+                }
+                case WL_SCOPE_RLV :
+                {
+                        thisSet = &RLVSet;
+                        thisSet->water.mName = sRLVPresetName;
+                        thisSet->sky.mName = sRLVPresetName;
+                        // TODO set enabled properly.
+                        break;
+                }
+        }
+        if (newWater)
+                thisSet->water.setAll(newWater->getAll());
+        if (newWaterNormal)
+                thisSet->water.mParamValues["normalMap"] = *newWaterNormal;
+        if (newSky)
+                thisSet->sky.setAll(newSky->getAll());
+        if ((NULL == newWater) && (NULL == newSky))
+                thisSet->enabled = false;
+        F32 fade = 0; //Instant
+        bool error;
+        fade = thisSet->sky.getFloat("fade", error);
+        if (fade)
+        {
+                // TODO - should copy the original, then set that here.
+                // The fade should delete this copy once it's done fading.
+                // Dunno if we actually need to do any of this anyway.
+                waterMgr->removeParamSet( oldWaterSet.mName, false );
+                waterMgr->addParamSet( oldWaterSet.mName, oldWaterSet );
+                waterMgr->setNormalMapID( *newWaterNormal );
+                waterMgr->getParamSet(oldWaterSet.mName, waterMgr->mCurParams);
+                waterMgr->propagateParameters();
+                skyMgr->removeParamSet( oldWLSet.mName, false );
+                skyMgr->addParamSet( oldWLSet.mName, oldWLSet );
+                skyMgr->getParamSet(oldWLSet.mName, skyMgr->mCurParams);
+                skyMgr->propagateParameters();
+        }
+        if (regionSet.enabled)
+        {
+                waterMgr->setParamSet( regionSet.water.mName, regionSet.water );
+                skyMgr->setParamSet( regionSet.sky.mName, regionSet.sky );
+                mergeWaterSets(&(regionSet.water), &oldWaterSet);
+                mergeWLSets(&(regionSet.sky), &oldWLSet);
+        }
+        else
+        {
+                waterMgr->removeParamSet( regionSet.water.mName, false );
+                skyMgr->removeParamSet( regionSet.sky.mName, false );
+        }
+        if (parcelSet.enabled)
+        {
+                waterMgr->setParamSet( parcelSet.water.mName, parcelSet.water );
+                skyMgr->setParamSet( parcelSet.sky.mName, parcelSet.sky );
+                mergeWaterSets(&(parcelSet.water), &oldWaterSet);
+                mergeWLSets(&(parcelSet.sky), &oldWLSet);
+        }
+        else
+        {
+                waterMgr->removeParamSet( parcelSet.water.mName, false );
+                skyMgr->removeParamSet( parcelSet.sky.mName, false );
+        }
+        if (userSet.enabled)
+        {
+                mergeWaterSets(&(userSet.water), &oldWaterSet);
+                mergeWLSets(&(userSet.sky), &oldWLSet);
+        }
+        if (RLVSet.enabled)
+        {
+                mergeWaterSets(&(RLVSet.water), &oldWaterSet);
+                mergeWLSets(&(RLVSet.sky), &oldWLSet);
+        }
+        skyMgr->mAnimator.mIsRunning = false;
+        skyMgr->mAnimator.mUseLindenTime = false;
+        if (fade)
+        {
+                waterMgr->SetMixTime(&oldWaterSet, fade);
+                skyMgr->SetMixTime(&oldWLSet, fade);
+        }
+        else
+        {
+                if (newWater)
+                {
+                        waterMgr->setParamSet( thisSet->water.mName, oldWaterSet );
+                        waterMgr->setNormalMapID( *newWaterNormal );
+                        waterMgr->getParamSet(thisSet->water.mName, waterMgr->mCurParams);
+                        waterMgr->propagateParameters();
+                }
+                if (newSky)
+                {
+                          skyMgr->setParamSet( thisSet->sky.mName, oldWLSet );
+                          skyMgr->getParamSet(thisSet->sky.mName, skyMgr->mCurParams);
+                          skyMgr->propagateParameters();
+                }
+        }
+        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
 }
+bool LightShare::isValid()
+{
+        return mIsValid;
+}
-void WindlightMessage::process_packet( char* buf )
+void LightShare::process_packet( char* buf )
 {
        // *FIXME: Horrible idea, fragile, not byte-order or endian
        //         safe, no validation, etc. etc. -Jacek
        mPacket = (Meta7WindlightPacket*)buf;
 }
+void LightShare::process_water()
-void WindlightMessage::process_water()
 {
        mWater->set("waterFogColor",
                                                        mPacket->waterColor.red   / 256.f,
@@ -316,7 +490,7 @@ void WindlightMessage::process_water()
 }
-void WindlightMessage::process_sky()
+void LightShare::process_sky()
 {
        mSky->setSunAngle(F_TWO_PI * mPacket->sunMoonPosiiton);
        mSky->setEastAngle(F_TWO_PI * mPacket->eastAngle);
@@ -411,5 +585,3 @@ void WindlightMessage::process_sky()
        mSky->setStarBrightness(mPacket->starBrightness);
 }
diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/llettherebelight.h
index e3cccf0..3c997e5 100644
--- a/linden/indra/newview/lightshare.h
+++ b/linden/indra/newview/llettherebelight.h
@@ -1,5 +1,5 @@
 /**
- * @file lightshare.h
+ * @file llettherebelight.h
 * @brief WindlightMessage class definition.
 *
 * Copyright (c) 2010, Jacek Antonelli
@@ -30,23 +30,34 @@
 #define LIGHTSHARE_H
 #include <string>
+#include "llwlparamset.h"
+#include "llwaterparamset.h"
+#include "lluuid.h"
 struct Meta7WindlightPacket;
-class LLMessageSystem;
-class LLSD;
-class LLTimer;
-class LLUUID;
-class LLWaterParamSet;
-class LLWLParamSet;
+typedef enum wl_scope
+{
+        WL_SCOPE_USER,
+        WL_SCOPE_REGION,
+        WL_SCOPE_PARCEL,
+        WL_SCOPE_RLV
+} WLScope;
+struct WLCombined
+{
+        LLWaterParamSet water;
+        LLWLParamSet sky;
+        BOOL enabled;
+};
 // Encapsulates a "Windlight" (LightShare) message sent from the
 // region, allowing the settings to be applied at a later time.
 //
-class WindlightMessage
+class LightShare
 {
-        public:
+public:
        // The meanings of the LightShareAllowed user setting.
        enum LIGHTSHARE_ALLOWED
        {
@@ -55,61 +66,49 @@ class WindlightMessage
                LIGHTSHARE_ALWAYS = 2,
        };
-        // Constructs a new WindlightMessage instance from a GenericMessage
+        // The name of the preset where the region settings are stored.
+        static const std::string sRegionPresetName;
+        // The name of the preset where the parcel settings are stored.
+        static const std::string sParcelPresetName;
+        // The name of the preset where the RLV settings are stored.
+        static const std::string sRLVPresetName;
+        // Constructs a new LightShare instance from a GenericMessage
        // with the "Windlight" method, such as those sent by a
        // Lightshare-enabled OpenSim region.
-        WindlightMessage( LLMessageSystem* msg );
+        LightShare( LLMessageSystem* msg );
-        ~WindlightMessage();
+        ~LightShare();
-        // 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;
        // Message handler for GenericMessage with the "Windlight" method.
-        // Creates and applies a new WindlightMessage (or prompts user).
+        // Creates and applies a new LightShare (or prompts user).
        static void processWindlight(LLMessageSystem* msg, void**);
-        // Callback when the user interacts with the notification.
+        static void applyMaybe(LLWaterParamSet* thisWater, LLUUID* thisVaterNormal, LLWLParamSet* thisSky);
-        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();
+        static void apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky, WLScope scope);
-        protected:
+private:
-        // 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;
        static LLTimer* sIgnoreTimer;
        static bool sIgnoreRegion;
        Meta7WindlightPacket* mPacket;
-        LLWaterParamSet* mWater;
+        static LLWaterParamSet* mWater;
-        LLWLParamSet* mSky;
+        static LLWLParamSet* mSky;
-        LLUUID* mWaterNormal;
+        static LLUUID* mWaterNormal;
        bool mIsValid;
+        // Callback when the user interacts with the notification.
+        static bool applyCallback(const LLSD& notification, const LLSD& response);
        // Converts the message's raw bytes into a Meta7WindlightPacket.
        void process_packet( char* buf );
@@ -119,6 +118,15 @@ class WindlightMessage
        // Constructs a LLWLParamSet from the Meta7WindlightPacket.
        void process_sky();
+        // 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();
+        static void mergeWaterSets(LLWaterParamSet* thisSet, LLWaterParamSet* oldSet);
+        static void mergeWLSets(LLWLParamSet* thisSet, LLWLParamSet* oldSet);
 };
 #endif
diff --git a/linden/indra/newview/llfloaterenvsettings.cpp b/linden/indra/newview/llfloaterenvsettings.cpp
index 801ff49..2cb1988 100644
--- a/linden/indra/newview/llfloaterenvsettings.cpp
+++ b/linden/indra/newview/llfloaterenvsettings.cpp
@@ -291,21 +291,6 @@ void LLFloaterEnvSettings::onOpenWLManager(void* userData)
        WLFloaterManager::show();
 }
-void LLFloaterEnvSettings::onSubmitWindlight(void* userData)
-{
-        Meta7WindlightPacket * wl = new Meta7WindlightPacket();
-        LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
-        wl->reflectionWaveletScale.X = param_mgr->mNormalScale.mX;
-        wl->reflectionWaveletScale.Y = param_mgr->mNormalScale.mY;
-        wl->reflectionWaveletScale.Z = param_mgr->mNormalScale.mZ;
-        
-        std::vector<std::string> strings;
-        strings.push_back((char*)wl);
-        send_generic_message("Windlight", strings);
-}
 void LLFloaterEnvSettings::onUseEstateTime(void* userData)
 {
        if(LLFloaterWindLight::isOpen())
diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index 3530f54..9dd3aab 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -1,11 +1,11 @@
-/** 
+/**
 * @file llfloaterwater.cpp
 * @brief LLFloaterWater class definition
 *
 * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
 * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
+ *
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
 * online at http://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
@@ -62,6 +62,7 @@
 #include "llwaterparamset.h"
 #include "llwaterparammanager.h"
+#include "llwlparammanager.h"
 #include "llpostprocess.h"
 #include "wlfloaterwindlightsend.h"
@@ -75,15 +76,15 @@ std::set<std::string> LLFloaterWater::sDefaultPresets;
 LLFloaterWater::LLFloaterWater() : LLFloater(std::string("water floater"))
 {
        LLUICtrlFactory::getInstance()->buildFloater(this, "floater_water.xml");
-        
        // add the combo boxes
        LLComboBox* comboBox = getChild<LLComboBox>("WaterPresetsCombo");
        if(comboBox != NULL) {
-                
-                std::map<std::string, LLWaterParamSet>::iterator mIt = 
+                std::map<std::string, LLWaterParamSet>::iterator mIt =
                        LLWaterParamManager::instance()->mParamList.begin();
-                for(; mIt != LLWaterParamManager::instance()->mParamList.end(); mIt++) 
+                for(; mIt != LLWaterParamManager::instance()->mParamList.end(); mIt++)
                {
                        comboBox->add(mIt->first);
                }
@@ -117,7 +118,7 @@ void LLFloaterWater::initCallbacks(void) {
        initHelpBtn("WaterFogColorHelp", "HelpWaterFogColor");
        initHelpBtn("WaterFogDensityHelp", "HelpWaterFogDensity");
        initHelpBtn("WaterUnderWaterFogModHelp", "HelpUnderWaterFogMod");
-        initHelpBtn("WaterGlowHelp", "HelpWaterGlow");  
+        initHelpBtn("WaterGlowHelp", "HelpWaterGlow");
        initHelpBtn("WaterNormalScaleHelp", "HelpWaterNormalScale");
        initHelpBtn("WaterFresnelScaleHelp", "HelpWaterFresnelScale");
        initHelpBtn("WaterFresnelOffsetHelp", "HelpWaterFresnelOffset");
@@ -134,7 +135,7 @@ void LLFloaterWater::initCallbacks(void) {
        childSetCommitCallback("WaterFogColor", onWaterFogColorMoved, &param_mgr->mFogColor);
-        // 
+        //
        childSetCommitCallback("WaterGlow", onColorControlAMoved, &param_mgr->mFogColor);
        // fog density
@@ -212,11 +213,11 @@ bool LLFloaterWater::newPromptCallback(const LLSD& notification, const LLSD& res
                // add the current parameters to the list
                // see if it's there first
-                std::map<std::string, LLWaterParamSet>::iterator mIt = 
+                std::map<std::string, LLWaterParamSet>::iterator mIt =
                        param_mgr->mParamList.find(text);
                // if not there, add a new one
-                if(mIt == param_mgr->mParamList.end()) 
+                if(mIt == param_mgr->mParamList.end())
                {
                        param_mgr->addParamSet(text, param_mgr->mCurParams);
                        comboBox->add(text);
@@ -227,8 +228,8 @@ bool LLFloaterWater::newPromptCallback(const LLSD& notification, const LLSD& res
                        param_mgr->savePreset(text);
                // otherwise, send a message to the user
-                } 
+                }
-                else 
+                else
                {
                        LLNotifications::instance().add("ExistsWaterPresetAlert");
                }
@@ -261,13 +262,13 @@ void LLFloaterWater::syncMenu()
        colCtrl->set(col);
        // fog and wavelets
-        param_mgr->mFogDensity.mExp = 
+        param_mgr->mFogDensity.mExp =
-                log(current_params.getFloat(param_mgr->mFogDensity.mName, err)) / 
+                log(current_params.getFloat(param_mgr->mFogDensity.mName, err)) /
                log(param_mgr->mFogDensity.mBase);
        param_mgr->setDensitySliderValue(param_mgr->mFogDensity.mExp);
        childSetValue("WaterFogDensity", param_mgr->mFogDensity.mExp);
-        
-        param_mgr->mUnderWaterFogMod.mX = 
+        param_mgr->mUnderWaterFogMod.mX =
                current_params.getFloat(param_mgr->mUnderWaterFogMod.mName, err);
        childSetValue("WaterUnderWaterFogMod", param_mgr->mUnderWaterFogMod.mX);
@@ -433,14 +434,14 @@ void LLFloaterWater::onColorControlRMoved(LLUICtrl* ctrl, void* userData)
        colorControl->mR = sldrCtrl->getValueF32();
        // move i if it's the max
-        if(colorControl->mR >= colorControl->mG 
+        if(colorControl->mR >= colorControl->mG
-                && colorControl->mR >= colorControl->mB 
+                && colorControl->mR >= colorControl->mB
                && colorControl->mHasSliderName)
        {
                colorControl->mI = colorControl->mR;
                std::string name = colorControl->mSliderName;
                name.append("I");
-                
                sWaterMenu->childSetValue(name, colorControl->mR);
        }
@@ -457,7 +458,7 @@ void LLFloaterWater::onColorControlGMoved(LLUICtrl* ctrl, void* userData)
        colorControl->mG = sldrCtrl->getValueF32();
        // move i if it's the max
-        if(colorControl->mG >= colorControl->mR 
+        if(colorControl->mG >= colorControl->mR
                && colorControl->mG >= colorControl->mB
                && colorControl->mHasSliderName)
        {
@@ -517,9 +518,9 @@ void LLFloaterWater::onColorControlIMoved(LLUICtrl* ctrl, void* userData)
        WaterColorControl * colorControl = static_cast<WaterColorControl *>(userData);
        colorControl->mI = sldrCtrl->getValueF32();
-        
        // only for sliders where we pass a name
-        if(colorControl->mHasSliderName) 
+        if(colorControl->mHasSliderName)
        {
                // set it to the top
                F32 maxVal = std::max(std::max(colorControl->mR, colorControl->mG), colorControl->mB);
@@ -541,7 +542,7 @@ void LLFloaterWater::onColorControlIMoved(LLUICtrl* ctrl, void* userData)
                        colorControl->mR = 0;
                        colorControl->mG = 0;
                        colorControl->mB = 0;
-                
                // if all at the start
                // set them all to the intensity
                }
@@ -597,7 +598,7 @@ void LLFloaterWater::onFloatControlMoved(LLUICtrl* ctrl, void* userData)
 void LLFloaterWater::onWaterFogColorMoved(LLUICtrl* ctrl, void* userData)
 {
        LLColorSwatchCtrl* swatch = static_cast<LLColorSwatchCtrl*>(ctrl);
-        WaterColorControl * colorControl = static_cast<WaterColorControl *>(userData);  
+        WaterColorControl * colorControl = static_cast<WaterColorControl *>(userData);
        *colorControl = swatch->get();
        colorControl->update(LLWaterParamManager::instance()->mCurParams);
@@ -652,7 +653,7 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
        }
        if (ctrl->getValue().asString() == "save_inventory_item")
-        {       
+        {
                // Check if this is already a notecard.
                if(LLWaterParamManager::instance()->mCurParams.mInventoryID.notNull())
                {
@@ -662,13 +663,13 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
                {
                        // Make sure we have a ".ww" extension.
                        std::string name = comboBox->getSelectedItemLabel();
-                        if(name.length() > 2 && name.compare(name.length() - 3, 3, ".ww") != 0)
+                        if(!LLWLParamManager::isWaterSettingsNotecard(name))
                        {
                                name += ".ww";
                        }
                        LLPointer<KVFloaterWaterNotecardCreatedCallback> cb = new KVFloaterWaterNotecardCreatedCallback();
                        // Create a notecard and then save it.
-                        create_inventory_item(gAgent.getID(), 
+                        create_inventory_item(gAgent.getID(),
                                                                  gAgent.getSessionID(),
                                                                  LLUUID::null,
                                                                  LLTransactionID::tnull,
@@ -679,7 +680,7 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
                                                                  NOT_WEARABLE,
                                                                  PERM_ITEM_UNRESTRICTED,
                                                                  cb);
-                        
                }
        }
        else if (ctrl->getValue().asString() == "send_to_server_item")
@@ -690,13 +691,13 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
        }
        else
        {
-                LLWaterParamManager::instance()->mCurParams.mName = 
+                LLWaterParamManager::instance()->mCurParams.mName =
                        comboBox->getSelectedItemLabel();
                // check to see if it's a default and shouldn't be overwritten
                std::set<std::string>::iterator sIt = sDefaultPresets.find(
                        comboBox->getSelectedItemLabel());
-                if(sIt != sDefaultPresets.end() && !gSavedSettings.getBOOL("WaterEditPresets")) 
+                if(sIt != sDefaultPresets.end() && !gSavedSettings.getBOOL("WaterEditPresets"))
                {
                        LLNotifications::instance().add("WLNoEditDefault");
                        return;
@@ -710,7 +711,7 @@ bool LLFloaterWater::saveNotecardCallback(const LLSD& notification, const LLSD&
 {
        S32 option = LLNotification::getSelectedOption(notification, response);
        // if they choose save, do it.  Otherwise, don't do anything
-        if(option == 0) 
+        if(option == 0)
        {
                LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
                param_mgr->setParamSet(param_mgr->mCurParams.mName, param_mgr->mCurParams);
@@ -723,12 +724,12 @@ bool LLFloaterWater::saveAlertCallback(const LLSD& notification, const LLSD& res
 {
        S32 option = LLNotification::getSelectedOption(notification, response);
        // if they choose save, do it.  Otherwise, don't do anything
-        if(option == 0) 
+        if(option == 0)
        {
                LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
                param_mgr->setParamSet(
-                        param_mgr->mCurParams.mName, 
+                        param_mgr->mCurParams.mName,
                        param_mgr->mCurParams);
                // comment this back in to save to file
@@ -755,13 +756,13 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
 {
        S32 option = LLNotification::getSelectedOption(notification, response);
        // if they choose delete, do it.  Otherwise, don't do anything
-        if(option == 0) 
+        if(option == 0)
        {
                LLComboBox* combo_box = sWaterMenu->getChild<LLComboBox>("WaterPresetsCombo");
                LLFloaterDayCycle* day_cycle = NULL;
                LLComboBox* key_combo = NULL;
-                if(LLFloaterDayCycle::isOpen()) 
+                if(LLFloaterDayCycle::isOpen())
                {
                        day_cycle = LLFloaterDayCycle::instance();
                        key_combo = day_cycle->getChild<LLComboBox>("WaterKeyPresets");
@@ -771,20 +772,20 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
                // check to see if it's a default and shouldn't be deleted
                std::set<std::string>::iterator sIt = sDefaultPresets.find(name);
-                if(sIt != sDefaultPresets.end()) 
+                if(sIt != sDefaultPresets.end())
                {
                        LLNotifications::instance().add("WaterNoEditDefault");
                        return false;
                }
                LLWaterParamManager::instance()->removeParamSet(name, true);
-                
                // remove and choose another
                S32 new_index = combo_box->getCurrentIndex();
                combo_box->remove(name);
-                if(key_combo != NULL) 
+                if(key_combo != NULL)
                {
                        key_combo->remove(name);
@@ -793,12 +794,12 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
                }
                // pick the previously selected index after delete
-                if(new_index > 0) 
+                if(new_index > 0)
                {
                        new_index--;
                }
-                
-                if(combo_box->getItemCount() > 0) 
+                if(combo_box->getItemCount() > 0)
                {
                        combo_box->setCurrentByIndex(new_index);
                }
@@ -810,12 +811,12 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
 void LLFloaterWater::onChangePresetName(LLUICtrl* ctrl, void * userData)
 {
        LLComboBox * combo_box = static_cast<LLComboBox*>(ctrl);
-        
        if(combo_box->getSimple() == "")
        {
                return;
        }
-        
        LLWaterParamManager::instance()->loadPreset(
                combo_box->getSelectedValue().asString());
        sWaterMenu->syncMenu();
@@ -827,12 +828,12 @@ void LLFloaterWater::onClickNext(void* user_data)
        LLWaterParamSet& currentParams = param_mgr->mCurParams;
        // find place of current param
-        std::map<std::string, LLWaterParamSet>::iterator mIt = 
+        std::map<std::string, LLWaterParamSet>::iterator mIt =
                param_mgr->mParamList.find(currentParams.mName);
        // if at the end, loop
        std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
-        if(mIt == last) 
+        if(mIt == last)
        {
                mIt = param_mgr->mParamList.begin();
        }
@@ -851,11 +852,11 @@ void LLFloaterWater::onClickPrev(void* user_data)
        LLWaterParamSet & currentParams = param_mgr->mCurParams;
        // find place of current param
-        std::map<std::string, LLWaterParamSet>::iterator mIt = 
+        std::map<std::string, LLWaterParamSet>::iterator mIt =
                param_mgr->mParamList.find(currentParams.mName);
        // if at the beginning, loop
-        if(mIt == param_mgr->mParamList.begin()) 
+        if(mIt == param_mgr->mParamList.begin())
        {
                std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
                mIt = last;
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 8f2eafb..52d6e14 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -873,7 +873,7 @@ void LLFloaterWindLight::onSavePreset(LLUICtrl* ctrl, void* userData)
                {
                        // Make sure we have a ".wl" extension.
                        std::string name = comboBox->getSelectedItemLabel();
-                        if(name.length() > 2 && name.compare(name.length() - 3, 3, ".wl") != 0)
+                        if(!LLWLParamManager::isSkySettingsNotecard(name))
                        {
                                name += ".wl";
                        }
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index c67c3c2..6e6b39c 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -3109,11 +3109,11 @@ void LLNotecardBridge::openItem()
        LLViewerInventoryItem* item = getItem();
        if (item)
        {
-                if(isSkySetting())
+                if(LLWLParamManager::isSkySettingsNotecard(getName()))
                {
                        LLWLParamManager::instance()->loadPresetNotecard(item->getName(), item->getAssetUUID(), mUUID);
                }
-                else if(isWaterSetting())
+                else if(LLWLParamManager::isWaterSettingsNotecard(getName()))
                {
                        LLWaterParamManager::instance()->loadPresetNotecard(item->getName(), item->getAssetUUID(), mUUID);
                }
@@ -3144,13 +3144,13 @@ void LLNotecardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
        else
        {
-                if(isWindLight())
+                if(LLWLParamManager::isSettingsNotecard(getName()))
                {
-                        if(isSkySetting())
+                        if(LLWLParamManager::isSkySettingsNotecard(getName()))
                        {
                                items.push_back(std::string("Use WindLight Settings"));
                        }
-                        else if(isWaterSetting())
+                        else if(LLWLParamManager::isWaterSettingsNotecard(getName()))
                        {
                                items.push_back(std::string("Use WaterLight Settings"));
                        }
@@ -3207,11 +3207,11 @@ void LLNotecardBridge::performAction(LLFolderView* folder, LLInventoryModel* mod
 LLUIImagePtr LLNotecardBridge::getIcon() const
 {
-        if(isSkySetting())
+        if(LLWLParamManager::isSkySettingsNotecard(getName()))
        {
                return LLUI::getUIImage("Inv_WindLight");
        }
-        else if(isWaterSetting())
+        else if(LLWLParamManager::isWaterSettingsNotecard(getName()))
        {
                return LLUI::getUIImage("Inv_WaterLight");
        }
@@ -3221,20 +3221,6 @@ LLUIImagePtr LLNotecardBridge::getIcon() const
        }
 }
-bool LLNotecardBridge::isSkySetting() const
-{
-        return (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".wl") == 0);
-}
-bool LLNotecardBridge::isWaterSetting() const
-{
-        return (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".ww") == 0);
-}
-bool LLNotecardBridge::isWindLight() const
-{
-        return (isSkySetting() || isWaterSetting());
-}
 // +=================================================+
 // |        LLGestureBridge                          |
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index 5a53aa5..0318e6c 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -511,9 +511,6 @@ public:
        virtual const std::string& getPrefix() { return sPrefix; }
        virtual LLUIImagePtr getIcon() const;
-        bool isSkySetting() const;
-        bool isWaterSetting() const;
-        bool isWindLight() const;
        virtual void openItem();
        virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
        virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 277ab15..8103ee9 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -81,6 +81,7 @@
 #include "llviewerobjectlist.h"
 #include "llviewerwindow.h"
 #include "llwearable.h"
+#include "llwlparammanager.h"
 #include "hippogridmanager.h"
@@ -1380,9 +1381,6 @@ public:
        virtual LLUIImagePtr getIcon() const;
        virtual void openItem();
        virtual BOOL removeItem();
-        bool isSkySetting() const;
-        bool isWaterSetting() const;
-        bool isWindLight() const;
 };
 LLTaskNotecardBridge::LLTaskNotecardBridge(
@@ -1412,7 +1410,7 @@ void LLTaskNotecardBridge::openItem()
                return;
        }
 // [/RLVa:KB]
-        if(isWindLight())
+        if(LLWLParamManager::isSettingsNotecard(getName()))
        {
                return;
        }
@@ -1442,11 +1440,11 @@ BOOL LLTaskNotecardBridge::removeItem()
 }
 LLUIImagePtr LLTaskNotecardBridge::getIcon() const
 {
-        if(isSkySetting())
+        if(LLWLParamManager::isSkySettingsNotecard(getName()))
        {
                return LLUI::getUIImage("Inv_WindLight");
        }
-        else if(isWaterSetting())
+        else if(LLWLParamManager::isWaterSettingsNotecard(getName()))
        {
                return LLUI::getUIImage("Inv_WaterLight");
        }
@@ -1456,22 +1454,6 @@ LLUIImagePtr LLTaskNotecardBridge::getIcon() const
        }
 }
-bool LLTaskNotecardBridge::isSkySetting() const
-{
-        return (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".wl") == 0);
-}
-bool LLTaskNotecardBridge::isWaterSetting() const
-{
-        return (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".ww") == 0);
-}
-bool LLTaskNotecardBridge::isWindLight() const
-{
-        return (isSkySetting() || isWaterSetting());
-}
 ///----------------------------------------------------------------------------
 /// Class LLTaskGestureBridge
 ///----------------------------------------------------------------------------
diff --git a/linden/indra/newview/llviewergenericmessage.cpp b/linden/indra/newview/llviewergenericmessage.cpp
index 8078888..779ed01 100644
--- a/linden/indra/newview/llviewergenericmessage.cpp
+++ b/linden/indra/newview/llviewergenericmessage.cpp
@@ -1,12 +1,12 @@
-/** 
+/**
 * @file llviewergenericmessage.cpp
 * @brief Handle processing of "generic messages" which contain short lists of strings.
 * @author James Cook
 *
 * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
 * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
+ *
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
@@ -14,17 +14,17 @@
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
 * online at http://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
@@ -39,7 +39,7 @@
 #include "message.h"
 #include "llagent.h"
 #include "lluuid.h"
-#include "lightshare.h"
+#include "llettherebelight.h"
 LLDispatcher gGenericDispatcher;
@@ -84,11 +84,11 @@ void process_generic_message(LLMessageSystem* msg, void**)
        msg->getUUID("AgentData", "AgentID", agent_id);
        std::string method;
        msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, method);
-        
        // TODO: Use a proper dispatcher.
        if(method == "Windlight")
-        {       
+        {
-                WindlightMessage::processWindlight(msg, NULL);
+                LightShare::processWindlight(msg, NULL);
                return;
        }
@@ -106,7 +106,7 @@ void process_generic_message(LLMessageSystem* msg, void**)
                if(!gGenericDispatcher.dispatch(request, invoice, strings))
                {
-                        llwarns << "GenericMessage " << request << " failed to dispatch" 
+                        llwarns << "GenericMessage " << request << " failed to dispatch"
                                << llendl;
                }
        }
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 9dd02eb..92e3fa9 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1,12 +1,12 @@
-/** 
+/**
 * @file llviewermessage.cpp
 * @brief Dumping ground for viewer-side message system callbacks.
 *
 * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
+ *
 * Copyright (c) 2002-2009, Linden Research, Inc.
- * 
+ *
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
@@ -14,17 +14,17 @@
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
 * online at http://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
@@ -37,7 +37,7 @@
 #include <deque>
-#include "llaudioengine.h" 
+#include "llaudioengine.h"
 #include "indra_constants.h"
 #include "lscript_byteformat.h"
 #include "mean_collision_data.h"
@@ -65,7 +65,7 @@
 #include "lltimer.h"
 #include "llmd5.h"
-#include "lightshare.h"
+#include "llettherebelight.h"
 #include "llagent.h"
 #include "llcallingcard.h"
 #include "llconsole.h"
@@ -132,6 +132,7 @@
 #include "llvlmanager.h"
 #include "llvoavatar.h"
 #include "llvotextbubble.h"
+#include "llwlparammanager.h"
 #include "llweb.h"
 #include "llworld.h"
 #include "pipeline.h"
@@ -151,7 +152,6 @@
 #include "hippogridmanager.h"
 #include "hippolimits.h"
-#include "wlsettingsmanager.h"
 #if LL_WINDOWS // For Windows specific error handler
 #include "llwindebug.h" // For the invalid message handler
@@ -195,8 +195,8 @@ const U32 OFFER_THROTTLE_MAX_COUNT=5; //number of items per time period
 const F32 OFFER_THROTTLE_TIME=10.f; //time period in seconds
 //script permissions
-const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] = 
+const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
-        { 
+        {
                "ScriptTakeMoney",
                "ActOnControlInputs",
                "RemapControlInputs",
@@ -210,7 +210,7 @@ const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
                "ControlYourCamera"
        };
-const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] = 
+const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
 {
        TRUE,   // ScriptTakeMoney,
        FALSE,  // ActOnControlInputs
@@ -462,7 +462,7 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
 //                                      char image_uuid_str[UUID_STR_SIZE];             /* Flawfinder: ignore */
 //                                      memcpy(image_uuid_str, pos_uuid+2, UUID_STR_SIZE-1);            /* Flawfinder: ignore */
 //                                      image_uuid_str[UUID_STR_SIZE-1] = 0;
-                                        
 //                                      LLUUID image_uuid(image_uuid_str);
 //                                      LL_INFOS("Messaging") << "Found UUID: " << image_uuid << LL_ENDL;
@@ -537,7 +537,7 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
 //      else
 //      {
 //              LLFILE* fIn = LLFile::fopen(filename, "rb");            /* Flawfinder: ignore */
-//              if (fIn) 
+//              if (fIn)
 //              {
 //                      LLPointer<LLImageJ2C> ImageUtility = new LLImageJ2C;
 //                      LLPointer<LLImageTGA> TargaUtility = new LLImageTGA;
@@ -558,13 +558,13 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
 //                      ImageUtility->updateData();
 //                      ImageUtility->decode(image, 100000.0f);
-                        
 //                      TargaUtility->encode(image);
 //                      U8 *data = TargaUtility->getData();
 //                      S32 data_size = TargaUtility->getDataSize();
 //                      std::string file_path = gDirUtilp->getDirName(filename);
-                        
 //                      std::string output_file = llformat("%s/image-%03d.tga", file_path.c_str(), image_num);//filename;
 //                      //S32 name_len = output_file.length();
 //                      //strcpy(&output_file[name_len-3], "tga");
@@ -749,10 +749,10 @@ private:
        std::string mFromName;
 };
-//unlike the FetchObserver for AgentOffer, we only make one 
+//unlike the FetchObserver for AgentOffer, we only make one
 //instance of the AddedObserver for TaskOffers
-//and it never dies.  We do this because we don't know the UUID of 
+//and it never dies.  We do this because we don't know the UUID of
-//task offers until they are accepted, so we don't wouldn't 
+//task offers until they are accepted, so we don't wouldn't
 //know what to watch for, so instead we just watch for all additions.
 class LLOpenTaskOffer : public LLInventoryAddedObserver
 {
@@ -769,7 +769,7 @@ LLOpenTaskOffer* gNewInventoryObserver=NULL;
 void start_new_inventory_observer()
 {
-        if (!gNewInventoryObserver) //task offer observer 
+        if (!gNewInventoryObserver) //task offer observer
        {
                // Observer is deleted by gInventory
                gNewInventoryObserver = new LLOpenTaskOffer;
@@ -828,7 +828,7 @@ protected:
 //Returns TRUE if we are OK, FALSE if we are throttled
-//Set check_only true if you want to know the throttle status 
+//Set check_only true if you want to know the throttle status
 //without registering a hit
 bool check_offer_throttle(const std::string& from_name, bool check_only)
 {
@@ -844,7 +844,7 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
        {
                return gThrottleTimer.hasExpired();
        }
-        
        if(gThrottleTimer.checkExpirationAndReset(OFFER_THROTTLE_TIME))
        {
                LL_DEBUGS("Messaging") << "Throttle Expired" << LL_ENDL;
@@ -890,7 +890,7 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
                }
        }
 }
- 
 void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 {
        std::vector<LLUUID>::const_iterator it = items.begin();
@@ -921,11 +921,9 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
                        {
                        case LLAssetType::AT_NOTECARD:
                                // Don't show WindLight settings as notecards.
-                                // *TODO: centralise all these damned .wl/.ww checks somewhere.
+                                if(!LLWLParamManager::isSettingsNotecard(item->getName()))
-                                if((item->getName().length() > 2 && item->getName().compare(item->getName().length() - 3, 3, ".wl") != 0) &&
-                                        (item->getName().compare(item->getName().length() - 3, 3, ".ww") != 0))
                                {
-                                        open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(), 
+                                        open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(),
                                                LLUUID::null, show_keep_discard, LLUUID::null, FALSE);
                                }
                                break;
@@ -941,7 +939,7 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
                        }
                }
                //highlight item, if it's not in the trash or lost+found
-                
                // Don't auto-open the inventory floater
                LLInventoryView* view = LLInventoryView::getActiveInventory();
                if(!view)
@@ -1021,7 +1019,7 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
                OfferMatcher(const LLUUID& to_block) : blocked_id(to_block) {}
                BOOL matches(const LLNotificationPtr notification) const
                {
-                        if(notification->getName() == "ObjectGiveItem" 
+                        if(notification->getName() == "ObjectGiveItem"
                                || notification->getName() == "ObjectGiveItemUnknownUser"
                                || notification->getName() == "UserGiveItem")
                        {
@@ -1097,7 +1095,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
        std::string name;
        gAgent.buildFullname(name);
        msg->addStringFast(_PREHASH_FromAgentName, name);
-        msg->addStringFast(_PREHASH_Message, ""); 
+        msg->addStringFast(_PREHASH_Message, "");
        msg->addU32Fast(_PREHASH_ParentEstateID, 0);
        msg->addUUIDFast(_PREHASH_RegionID, LLUUID::null);
        msg->addVector3Fast(_PREHASH_Position, gAgent.getPositionAgent());
@@ -1157,9 +1155,9 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
        {
                from_string = chatHistory_string = mFromName;
        }
-        
        bool busy=FALSE;
-        
        switch(button)
        {
        case IOR_ACCEPT:
@@ -1181,7 +1179,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
                // ACCEPT. The math for the dialog works, because the accept
                // for inventory_offered, task_inventory_offer or
                // group_notice_inventory is 1 greater than the offer integer value.
-                // Generates IM_INVENTORY_ACCEPTED, IM_TASK_INVENTORY_ACCEPTED, 
+                // Generates IM_INVENTORY_ACCEPTED, IM_TASK_INVENTORY_ACCEPTED,
                // or IM_GROUP_NOTICE_INVENTORY_ACCEPTED
                msg->addU8Fast(_PREHASH_Dialog, (U8)(mIM + 1));
                msg->addBinaryDataFast(_PREHASH_BinaryBucket, &(mFolderID.mData),
@@ -1281,7 +1279,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
                LLFloaterChat::addChatHistory(chat);
                // If it's from an agent, we have to fetch the item to throw
-                // it away. If it's from a task or group, just denying the 
+                // it away. If it's from a task or group, just denying the
                // request will suffice to discard the item.
                if(IM_INVENTORY_OFFERED == mIM)
                {
@@ -1299,7 +1297,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
                        {
                                opener = discard_agent_offer;
                        }
-                        
                }
                if (busy &&     (!mFromGroup && !mFromObject))
                {
@@ -1331,7 +1329,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
                info->forceResponse(IOR_BUSY);
                return;
        }
-        
        //If muted, don't even go through the messaging stuff.  Just curtail the offer here.
        if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName))
        {
@@ -1370,7 +1368,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
                }
 // [/RLVa:KB]
        }
-        
        LLSD args;
        args["[OBJECTNAME]"] = msg;
@@ -1473,7 +1471,7 @@ static LLNotificationFunctorRegistration group_vote_callback_reg("GroupVote", gr
 bool lure_callback(const LLSD& notification, const LLSD& response)
 {
        S32 option = 0;
-        if (response.isInteger()) 
+        if (response.isInteger())
        {
                option = response.asInteger();
        }
@@ -1481,7 +1479,7 @@ bool lure_callback(const LLSD& notification, const LLSD& response)
        {
                option = LLNotification::getSelectedOption(notification, response);
        }
-        
        LLUUID from_id = notification["payload"]["from_id"].asUUID();
        LLUUID lure_id = notification["payload"]["lure_id"].asUUID();
        BOOL godlike = notification["payload"]["godlike"].asBoolean();
@@ -1541,7 +1539,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
        S32 binary_bucket_size;
        LLChat chat;
        std::string buffer;
-        
        // *TODO:translate - need to fix the full name to first/last (maybe)
        msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, from_id);
        msg->getBOOLFast(_PREHASH_MessageBlock, _PREHASH_FromGroup, from_group);
@@ -1566,7 +1564,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
        BOOL is_owned_by_me = FALSE;
        LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id);
-        
        chat.mMuted = is_muted && !is_linden;
        chat.mFromID = from_id;
        chat.mFromName = name;
@@ -1594,7 +1592,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
        || dialog == IM_TYPING_STOP
        || dialog == IM_BUSY_AUTO_RESPONSE)
        {
-                
                if(session_id != computed_session_id)
                {
                        session_id = computed_session_id;
@@ -1833,7 +1831,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                                }
                                        }
                                        //InstantMessageResponseItem<
-                                        
                                }
                        }
                }
@@ -1853,10 +1851,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                LLNotifications::instance().add("SystemMessageTip",args);
                break;
-        case IM_NOTHING_SPECIAL: 
+        case IM_NOTHING_SPECIAL:
                // Don't show dialog, just do IM
                if (!gAgent.isGodlike()
-                                && gAgent.getRegion()->isPrelude() 
+                                && gAgent.getRegion()->isPrelude()
                                && to_id.isNull() )
                {
                        // do nothing -- don't distract newbies in
@@ -1873,11 +1871,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 // [/RLVa:KB]
 //              else if (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM)
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
-                else if ( (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM) && 
+                else if ( (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM) &&
                              ( (!gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.isException(RLV_BHVR_RECVIM, from_id))) )
 // [/RLVa:KB]
                {
-                        // return a standard "busy" message, but only do it to online IM 
+                        // return a standard "busy" message, but only do it to online IM
                        // (i.e. not other auto responses and not store-and-forward IM)
                        if (!gIMMgr->hasSession(session_id))
                        {
@@ -1903,7 +1901,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                        // now store incoming IM in chat history
                        buffer = separator_string + message.substr(message_offset);
-        
                        LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
                        // add to IM panel, but do not bother the user
@@ -1934,7 +1932,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                {
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
                        // Filter region messages that weren't sent by a Linden
-                        if ( (rlv_handler_t::isEnabled()) && (LLMuteList::getInstance()) && 
+                        if ( (rlv_handler_t::isEnabled()) && (LLMuteList::getInstance()) &&
                                (!LLMuteList::getInstance()->isLinden(name)) && (from_id != gAgent.getID()) )
                        {
                                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
@@ -2049,7 +2047,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                U8 item_name[DB_INV_ITEM_NAME_BUF_SIZE];
                        }* notice_bin_bucket;
-                        // Make sure the binary bucket is big enough to hold the header 
+                        // Make sure the binary bucket is big enough to hold the header
                        // and a null terminated item name.
                        if ( (binary_bucket_size < (S32)((sizeof(notice_bucket_header_t) + sizeof(U8))))
                                || (binary_bucket[binary_bucket_size - 1] != '\0') )
@@ -2070,7 +2068,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                        if (has_inventory)
                        {
                                info = new LLOfferInfo;
-                                
                                info->mIM = IM_GROUP_NOTICE;
                                info->mFromID = from_id;
                                info->mFromGroup = from_group;
@@ -2086,7 +2084,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                info->mDesc = item_name;
                                info->mHost = msg->getSender();
                        }
-                        
                        std::string str(message);
                        // Tokenize the string.
@@ -2290,7 +2288,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                LL_WARNS("Messaging") << "Received IM: IM_GROUP_ELECTION_DEPRECATED" << LL_ENDL;
        }
        break;
-        
        case IM_SESSION_SEND:
        {
                if (!is_linden && is_busy)
@@ -2352,7 +2350,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                        {
                                group_name = std::string((char*)binary_bucket);
                        }
-                        chat.mText = std::string("IM [") + group_name + std::string("] ") + name 
+                        chat.mText = std::string("IM [") + group_name + std::string("] ") + name
                                                + separator_string + saved + message.substr(message_offset);
                }
                else
@@ -2399,7 +2397,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                        }
                                std::string tempname = name;
-                
                                size_t found = tempname.find(" ");
                                while(found != std::string::npos)
                                {
@@ -2411,7 +2409,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                                {
                                        name = ">>";
                                        chat.mFromName = name;
-                                        
                                }
                        std::ostringstream link;
@@ -2463,14 +2461,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                        gIMMgr->addMessage(session_id, from_id, name, buffer);
                }
                break;
-                
        case IM_LURE_USER:
                {
                        if (is_muted)
-                        { 
+                        {
                                return;
                        }
-                        else if (is_busy) 
+                        else if (is_busy)
                        {
                                busy_message(msg,from_id);
                        }
@@ -2606,7 +2604,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                        }
                        std::string url;
-                        
                        url.assign((char*)binary_bucket, binary_bucket_size-1);
                        args["MESSAGE"] = message;
                        args["URL"] = url;
@@ -2656,11 +2654,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
                        // as the database should already include the relationship.  But it
                        // doesn't hurt for dupes.
                        LLAvatarTracker::formFriendship(from_id);
-                        
                        std::vector<std::string> strings;
                        strings.push_back(from_id.asString());
                        send_generic_message("requestonlinenotification", strings);
-                        
                        args["NAME"] = name;
                        LLNotifications::instance().add("FriendshipAccepted", args);
                }
@@ -2680,7 +2678,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
        }
 }
-void busy_message (LLMessageSystem* msg, LLUUID from_id) 
+void busy_message (LLMessageSystem* msg, LLUUID from_id)
 {
        if (gAgent.getBusy())
        {
@@ -2723,7 +2721,7 @@ bool callingcard_offer_callback(const LLSD& notification, const LLSD& response)
                msg->sendReliable(LLHost(notification["payload"]["sender"].asString()));
                break;
        case 1:
-                // decline              
+                // decline
                msg->newMessageFast(_PREHASH_DeclineCallingCard);
                msg->nextBlockFast(_PREHASH_AgentData);
                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
@@ -2774,7 +2772,7 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
        if(!source_name.empty())
        {
-                if (gAgent.getBusy() 
+                if (gAgent.getBusy()
                        || LLMuteList::getInstance()->isMuted(source_id, source_name, LLMute::flagTextChat))
                {
                        // automatically decline offer
@@ -2831,13 +2829,13 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
        msg->getString("ChatData", "FromName", from_name);
        chat.mFromName = from_name;
-        
        msg->getUUID("ChatData", "SourceID", from_id);
        chat.mFromID = from_id;
-        
        // Object owner for objects
        msg->getUUID("ChatData", "OwnerID", owner_id);
-        
        msg->getU8Fast(_PREHASH_ChatData, _PREHASH_SourceType, source_temp);
        chat.mSourceType = (EChatSourceType)source_temp;
@@ -2846,9 +2844,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
        msg->getU8Fast(_PREHASH_ChatData, _PREHASH_Audible, audible_temp);
        chat.mAudible = (EChatAudible)audible_temp;
-        
        chat.mTime = LLFrameTimer::getElapsedSeconds();
-        
        BOOL is_busy = gAgent.getBusy();
        BOOL is_muted = FALSE;
@@ -2856,7 +2854,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
        is_muted = LLMuteList::getInstance()->isMuted(
                from_id,
                from_name,
-                LLMute::flagTextChat) 
+                LLMute::flagTextChat)
                || LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagTextChat);
        is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT &&
                LLMuteList::getInstance()->isLinden(from_name);
@@ -2866,9 +2864,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
        if (chatter)
        {
                chat.mPosAgent = chatter->getPositionAgent();
-                
                // Make swirly things only for talking objects. (not script debug messages, though)
-//              if (chat.mSourceType == CHAT_SOURCE_OBJECT 
+//              if (chat.mSourceType == CHAT_SOURCE_OBJECT
 //                      && chat.mChatType != CHAT_TYPE_DEBUG_MSG)
 // [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-10 (RLVa-1.0.0g)
                // Don't show swirly things for llOwnerSay() chat here because we handle those further down
@@ -2880,7 +2878,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                        LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
                        psc->setSourceObject(chatter);
                        psc->setColor(color);
-                        //We set the particles to be owned by the object's owner, 
+                        //We set the particles to be owned by the object's owner,
                        //just in case they should be muted by the mute list
                        psc->setOwnerUUID(owner_id);
                        LLViewerPartSim::getInstance()->addPartSource(psc);
@@ -2890,7 +2888,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                if (is_audible
                        && (is_linden || (!is_muted && !is_busy)))
                {
-                        if (chat.mChatType != CHAT_TYPE_START 
+                        if (chat.mChatType != CHAT_TYPE_START
                                && chat.mChatType != CHAT_TYPE_STOP)
                        {
                                gAgent.heardChat(chat.mFromID);
@@ -2900,7 +2898,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                is_owned_by_me = chatter->permYouOwner();
        }
-        if(chat.mSourceType == CHAT_SOURCE_OBJECT 
+        if(chat.mSourceType == CHAT_SOURCE_OBJECT
                && chat.mChatType != CHAT_TYPE_DEBUG_MSG
                && !owner_id.isNull()
                && owner_id != gAgent.getID())
@@ -2962,7 +2960,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                msg->getStringFast(_PREHASH_ChatData, _PREHASH_Message, mesg);
 // [RLVa:KB] - Checked: 2009-10-06 (RLVa-1.0.4d) | Modified: RLVa-1.0.4d
-                if ( (rlv_handler_t::isEnabled()) && 
+                if ( (rlv_handler_t::isEnabled()) &&
                         (CHAT_TYPE_START != chat.mChatType) && (CHAT_TYPE_STOP != chat.mChatType) && (CHAT_TYPE_OWNER != chat.mChatType) )
                {
                        // NOTE: chatter can be NULL (may not have rezzed yet, or could be another avie's HUD attachment)
@@ -2971,7 +2969,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                        // Filtering "rules":
                        //   avatar  => filter all avie text (unless it's this avie or they're an exemption)
                        //   objects => filter everything except attachments this avie owns
-                        if ( ( (CHAT_SOURCE_AGENT == chat.mSourceType) && (from_id != gAgent.getID()) ) || 
+                        if ( ( (CHAT_SOURCE_AGENT == chat.mSourceType) && (from_id != gAgent.getID()) ) ||
                                 ( (CHAT_SOURCE_OBJECT == chat.mSourceType) && ((!is_owned_by_me) || (!is_attachment)) ) )
                        {
                                if (!rlvIsEmote(mesg))
@@ -2994,7 +2992,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                                {
                                        if (chat.mFromID != gAgent.getID())
                                                from_name = RlvStrings::getAnonym(from_name);
-                                } 
+                                }
                                else
                                {
                                        if ( (!is_owned_by_me) || (!is_attachment) )
@@ -3036,7 +3034,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                        if (LLFloaterMap::getInstance())
                        {
                                PanelRadarEntry* entry = LLFloaterMap::getInstance()->getRadar()->getEntry(from_id);
-                                if (entry) 
+                                if (entry)
                                {
                                        entry->setStatus(RADAR_STATUS_TYPING);
                                }
@@ -3057,7 +3055,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                        if (LLFloaterMap::getInstance())
                        {
                                PanelRadarEntry* entry = LLFloaterMap::getInstance()->getRadar()->getEntry(from_id);
-                                if (entry) 
+                                if (entry)
                                {
                                        entry->setStatus(RADAR_STATUS_NONE);
                                }
@@ -3074,7 +3072,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                        if (!is_muted && !is_busy)
                        {
-                                
                                BOOL sUseChatBubbles = gSavedSettings.getBOOL("UseChatBubbles");
                                if(sUseChatBubbles)
                                {
@@ -3160,7 +3158,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                                                verb = " retained: @";
                                                mesg = strRetained;
                                        }
-                                        else 
+                                        else
                                        {
                                                verb = ": @";
                                                if (!strExecuted.empty())
@@ -3181,7 +3179,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                                        LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
                                        psc->setSourceObject(chatter);
                                        psc->setColor(color);
-                                        //We set the particles to be owned by the object's owner, 
+                                        //We set the particles to be owned by the object's owner,
                                        //just in case they should be muted by the mute list
                                        psc->setOwnerUUID(owner_id);
                                        LLViewerPartSim::getInstance()->addPartSource(psc);
@@ -3209,7 +3207,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                        chat.mText += verb;
                        chat.mText += mesg;
                }
-                
                if (chatter)
                {
                        chat.mPosAgent = chatter->getPositionAgent();
@@ -3228,9 +3226,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
                // T            *               *               *                               F                       Yes                     Yes
                chat.mMuted = is_muted && !is_linden;
-                
-                
-                if (!visible_in_chat_bubble 
+                if (!visible_in_chat_bubble
                        && (is_linden || !is_busy || is_owned_by_me))
                {
                        // show on screen and add to history
@@ -3246,10 +3244,10 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 // Simulator we're on is informing the viewer that the agent
-// is starting to teleport (perhaps to another sim, perhaps to the 
+// is starting to teleport (perhaps to another sim, perhaps to the
-// same sim). If we initiated the teleport process by sending some kind 
+// same sim). If we initiated the teleport process by sending some kind
-// of TeleportRequest, then this info is redundant, but if the sim 
+// of TeleportRequest, then this info is redundant, but if the sim
-// initiated the teleport (via a script call, being killed, etc.) 
+// initiated the teleport (via a script call, being killed, etc.)
 // then this info is news to us.
 void process_teleport_start(LLMessageSystem *msg, void**)
 {
@@ -3276,7 +3274,7 @@ void process_teleport_start(LLMessageSystem *msg, void**)
                gTeleportDisplay = TRUE;
                gAgent.setTeleportState( LLAgent::TELEPORT_START );
                make_ui_sound("UISndTeleportOut");
-                
                // Don't call LLFirstUse::useTeleport here because this could be
                // due to being killed, which would send you home, not to a Telehub
        }
@@ -3313,7 +3311,7 @@ void process_teleport_progress(LLMessageSystem* msg, void**)
        //if we don't find the coresponding mapping in our progress mappings
        std::string message = buffer;
-        if (LLAgent::sTeleportProgressMessages.find(buffer) != 
+        if (LLAgent::sTeleportProgressMessages.find(buffer) !=
                LLAgent::sTeleportProgressMessages.end() )
        {
                message = LLAgent::sTeleportProgressMessages[buffer];
@@ -3374,7 +3372,7 @@ public:
-class LLPostTeleportNotifiers : public LLEventTimer 
+class LLPostTeleportNotifiers : public LLEventTimer
 {
 public:
        LLPostTeleportNotifiers();
@@ -3401,10 +3399,10 @@ BOOL LLPostTeleportNotifiers::tick()
                LLInventoryFetchDescendentsObserver::folder_ref_t folders;
                LLUUID folder_id;
                folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD);
-                if(folder_id.notNull()) 
+                if(folder_id.notNull())
                        folders.push_back(folder_id);
                folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
-                if(folder_id.notNull()) 
+                if(folder_id.notNull())
                        folders.push_back(folder_id);
                if(!folders.empty())
                {
@@ -3460,7 +3458,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
        msg->getU64Fast(_PREHASH_Info, _PREHASH_RegionHandle, region_handle);
        U32 teleport_flags;
        msg->getU32Fast(_PREHASH_Info, _PREHASH_TeleportFlags, teleport_flags);
-        
        U32 region_size_x = 256;
        msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x);
        U32 region_size_y = 256;
@@ -3472,17 +3470,17 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
                region_size_x = 256;
                region_size_y = 256;
        }
-        
        std::string seedCap;
        msg->getStringFast(_PREHASH_Info, _PREHASH_SeedCapability, seedCap);
-        // update home location if we are teleporting out of prelude - specific to teleporting to welcome area 
+        // update home location if we are teleporting out of prelude - specific to teleporting to welcome area
        if((teleport_flags & TELEPORT_FLAGS_SET_HOME_TO_TARGET)
           && (!gAgent.isGodlike()))
        {
                gAgent.setHomePosRegion(region_handle, pos);
-                // Create a timer that will send notices when teleporting is all finished.  Since this is 
+                // Create a timer that will send notices when teleporting is all finished.  Since this is
                // based on the LLEventTimer class, it will be managed by that class and not orphaned or leaked.
                new LLPostTeleportNotifiers();
        }
@@ -3546,8 +3544,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 //      gViewerWindow->setShowProgress(TRUE);
        // Tell the LightShare handler that we have changed regions.
-        WindlightMessage::resetRegion();
+        LightShare::resetRegion();
-        WLSettingsManager::wlresetRegion();
 }
 // stuff we have to do every time we get an AvatarInitComplete from a sim
@@ -3585,7 +3582,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
        msg->getVector3Fast(_PREHASH_Data, _PREHASH_LookAt, look_at);
        U64 region_handle;
        msg->getU64Fast(_PREHASH_Data, _PREHASH_RegionHandle, region_handle);
-        
        std::string version_channel;
        msg->getString("SimData", "ChannelVersion", version_channel);
@@ -3607,8 +3604,8 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
                        LL_WARNS("Messaging") << "current region " << gAgent.getRegion()->getOriginGlobal() << LL_ENDL;
                }
-                LL_WARNS("Messaging") << "Agent being sent to invalid home region: " 
+                LL_WARNS("Messaging") << "Agent being sent to invalid home region: "
-                        << x << ":" << y 
+                        << x << ":" << y
                        << " current pos " << gAgent.getPositionGlobal()
                        << LL_ENDL;
                LLAppViewer::instance()->forceDisconnect("You were sent to an invalid region.");
@@ -3656,7 +3653,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 //              if (avatarp)
                {
                        // Chat the "back" SLURL. (DEV-4907)
-                        // Show this in the console if DisableTeleportScreens is true 
+                        // Show this in the console if DisableTeleportScreens is true
                        // Why? Because it's nifty, that's why -- MC
                        LLChat chat("Teleport completed from " + gAgent.getTeleportSourceSLURL());
                        chat.mSourceType = CHAT_SOURCE_SYSTEM;
@@ -3746,7 +3743,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
        {
                avatarp->mFootPlane.clearVec();
        }
-        
        // send walk-vs-run status
        gAgent.sendWalkRun(gAgent.getRunning() || gAgent.getAlwaysRun());
@@ -3803,7 +3800,7 @@ void process_crossed_region(LLMessageSystem* msg, void**)
        LLHost sim_host(sim_ip, sim_port);
        U64 region_handle;
        msg->getU64Fast(_PREHASH_RegionData, _PREHASH_RegionHandle, region_handle);
-        
        std::string seedCap;
        msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, seedCap);
@@ -3825,8 +3822,7 @@ void process_crossed_region(LLMessageSystem* msg, void**)
        regionp->setSeedCapability(seedCap);
        // Tell the LightShare handler that we have changed regions.
-        WindlightMessage::resetRegion();
+        LightShare::resetRegion();
-        WLSettingsManager::wlresetRegion();
 }
@@ -3872,11 +3868,11 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
        const U8 DUP_MSGS = 1;                          //  HACK!  number of times to repeat data on motionless agent
        //  Store data on last sent update so that if no changes, no send
-        static LLVector3 last_camera_pos_agent, 
+        static LLVector3 last_camera_pos_agent,
-                                         last_camera_at, 
+                                         last_camera_at,
                                         last_camera_left,
                                         last_camera_up;
-        
        static LLVector3 cam_center_chg,
                                         cam_rot_chg;
@@ -3929,13 +3925,13 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
        head_rot_chg = dot(last_head_rot, head_rotation);
-        if (force_send || 
+        if (force_send ||
-                (cam_center_chg.magVec() > TRANSLATE_THRESHOLD) || 
+                (cam_center_chg.magVec() > TRANSLATE_THRESHOLD) ||
-                (head_rot_chg < THRESHOLD_HEAD_ROT_QDOT) ||     
+                (head_rot_chg < THRESHOLD_HEAD_ROT_QDOT) ||
                (last_render_state != render_state) ||
                (cam_rot_chg.magVec() > ROTATION_THRESHOLD) ||
                control_flag_change != 0 ||
-                flag_change != 0)  
+                flag_change != 0)
        {
 /*
                if (head_rot_chg < THRESHOLD_HEAD_ROT_QDOT)
@@ -3943,7 +3939,7 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
                        //LL_INFOS("Messaging") << "head rot " << head_rotation << LL_ENDL;
                        LL_INFOS("Messaging") << "head_rot_chg = " << head_rot_chg << LL_ENDL;
                }
-                if (cam_rot_chg.magVec() > ROTATION_THRESHOLD) 
+                if (cam_rot_chg.magVec() > ROTATION_THRESHOLD)
                {
                        LL_INFOS("Messaging") << "cam rot " <<  cam_rot_chg.magVec() << LL_ENDL;
                }
@@ -3974,8 +3970,8 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
                        // some threshold from the last update, however this can break fine
                        // adjustments when trying to aim an attached gun, so what we do here
                        // (where we would normally skip sending an update when nothing has changed)
-                        // is gradually reduce the threshold to allow a better update to 
+                        // is gradually reduce the threshold to allow a better update to
-                        // eventually get sent... should update to within 0.5 degrees in less 
+                        // eventually get sent... should update to within 0.5 degrees in less
                        // than a second.
                        if (head_rot_chg < THRESHOLD_HEAD_ROT_QDOT + (MAX_HEAD_ROT_QDOT - THRESHOLD_HEAD_ROT_QDOT) * duplicate_count / AGENT_UPDATES_PER_SECOND)
                        {
@@ -4008,13 +4004,13 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 //              {
 //                      LL_INFOS("Messaging") << "Sending camera center " << camera_pos_agent << LL_ENDL;
 //              }
-                
                msg->addVector3Fast(_PREHASH_CameraCenter, camera_pos_agent);
                msg->addVector3Fast(_PREHASH_CameraAtAxis, LLViewerCamera::getInstance()->getAtAxis());
                msg->addVector3Fast(_PREHASH_CameraLeftAxis, LLViewerCamera::getInstance()->getLeftAxis());
                msg->addVector3Fast(_PREHASH_CameraUpAxis, LLViewerCamera::getInstance()->getUpAxis());
                msg->addF32Fast(_PREHASH_Far, gAgent.mDrawDistance);
-                
                msg->addU32Fast(_PREHASH_ControlFlags, control_flags);
                if (gDebugClicks)
@@ -4043,7 +4039,7 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 //              LL_DEBUGS("Messaging") << "agent " << avatar_pos_agent << " cam " << camera_pos_agent << LL_ENDL;
-                // Copy the old data 
+                // Copy the old data
                last_head_rot = head_rotation;
                last_render_state = render_state;
                last_camera_pos_agent = camera_pos_agent;
@@ -4062,7 +4058,7 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 extern U32 gObjectBits;
 void process_object_update(LLMessageSystem *mesgsys, void **user_data)
-{       
+{
        LLMemType mt(LLMemType::MTYPE_OBJECT);
        // Update the data counters
        if (mesgsys->getReceiveCompressedSize())
@@ -4268,7 +4264,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
        // Don't play sounds triggered by someone you muted.
        if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
-        
        // Don't play sounds from an object you muted
        if (LLMuteList::getInstance()->isMuted(object_id)) return;
@@ -4298,7 +4294,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
        {
                return;
        }*/
-                
        gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global);
 }
@@ -4322,10 +4318,10 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
        if (LLMuteList::getInstance()->isMuted(object_id)) return;
        if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
-        
        LLAudioSource *sourcep = objectp->getAudioSource(owner_id);
        if (!sourcep) return;
-        
        LLAudioData *datap = gAudiop->getAudioData(sound_id);
        // Note that I don't actually do any loading of the
@@ -4339,7 +4335,7 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
        {
                return;
        }*/
-        
        // Add audioData starts a transfer internally.
        sourcep->addAudioData(datap, FALSE);
 }
@@ -4367,12 +4363,12 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
                // we don't know about this object, just bail
                return;
        }
-        
        if (LLMuteList::getInstance()->isMuted(object_id)) return;
-        
        if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
-        
        // Don't play sounds from a region with maturity above current agent maturity
        // Actually, let's -- MC
        /*LLVector3d pos = objectp->getPositionGlobal();
@@ -4380,7 +4376,7 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
        {
                return;
        }*/
-        
        objectp->setAttachedSound(sound_id, owner_id, gain, flags);
 }
@@ -4419,7 +4415,7 @@ void process_health_message(LLMessageSystem *mesgsys, void **user_data)
 void process_sim_stats(LLMessageSystem *msg, void **user_data)
-{       
+{
        S32 count = msg->getNumberOfBlocks("Stat");
        for (S32 i = 0; i < count; ++i)
        {
@@ -4568,7 +4564,7 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data)
                BOOL was_flying = gAgent.getFlying();
                regionp->setRegionFlags(region_flags);
                regionp->setMaxTasks(max_tasks_per_region);
-                // HACK: This makes agents drop from the sky if the region is 
+                // HACK: This makes agents drop from the sky if the region is
                // set to no fly while people are still in the sim.
                if (was_flying && regionp->getBlockFly())
                {
@@ -4585,7 +4581,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
        LLUUID  uuid;
        S32             anim_sequence_id;
        LLVOAvatar *avatarp;
-        
        mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid);
        //clear animation flags
@@ -4602,7 +4598,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
        S32 num_source_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationSourceList);
        avatarp->mSignaledAnimations.clear();
-        
        if (avatarp->isSelf())
        {
                LLUUID object_id;
@@ -4612,7 +4608,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
                        mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
                        mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
-                        LL_DEBUGS("Messaging") << "Animation id " << animation_id 
+                        LL_DEBUGS("Messaging") << "Animation id " << animation_id
                                                                   << " from self using sequence id " << anim_sequence_id << LL_ENDL;
                        avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
@@ -4620,7 +4616,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
                        if (i < num_source_blocks)
                        {
                                mesgsys->getUUIDFast(_PREHASH_AnimationSourceList, _PREHASH_ObjectID, object_id, i);
-                        
                                LLViewerObject* object = gObjectList.findObject(object_id);
                                if (object)
                                {
@@ -4652,8 +4648,8 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
                        mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
                        mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
                        avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
-                        LL_DEBUGS("Messaging") << "Received animation id " << animation_id 
+                        LL_DEBUGS("Messaging") << "Received animation id " << animation_id
-                                                                   << " from " << uuid 
+                                                                   << " from " << uuid
                                                                   << " using sequence id " << anim_sequence_id << LL_ENDL;
                }
        }
@@ -4728,7 +4724,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
        {
                gAgent.setSitCamera(sitObjectID, camera_eye, camera_at);
        }
-        
        gAgent.mForceMouselook = force_mouselook;
        LLViewerObject* object = gObjectList.findObject(sitObjectID);
@@ -4824,7 +4820,7 @@ void process_set_follow_cam_properties(LLMessageSystem *mesgsys, void **user_dat
                        LLFollowCamMgr::setFocusThreshold(source_id, value);
                        break;
                case FOLLOWCAM_ACTIVE:
-                        //if 1, set using followcam,. 
+                        //if 1, set using followcam,.
                        LLFollowCamMgr::setCameraActive(source_id, value != 0.f);
                        break;
                case FOLLOWCAM_POSITION_X:
@@ -4876,7 +4872,7 @@ void process_set_follow_cam_properties(LLMessageSystem *mesgsys, void **user_dat
                LLFollowCamMgr::setFocusOffset(source_id, focus_offset);
        }
 }
-//end Ventrella 
+//end Ventrella
 // Culled from newsim lltask.cpp
@@ -5068,7 +5064,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 bool handle_special_notification_callback(const LLSD& notification, const LLSD& response)
 {
        S32 option = LLNotification::getSelectedOption(notification, response);
-        
        if (0 == option)
        {
                // set the preference to the maturity of the region we're calling
@@ -5077,7 +5073,7 @@ bool handle_special_notification_callback(const LLSD& notification, const LLSD&
                gAgent.sendMaturityPreferenceToServer(preferredMaturity);
        }
-        
        return false;
 }
@@ -5086,10 +5082,10 @@ bool handle_special_notification(std::string notificationID, LLSD& llsdBlock)
 {
        int regionAccess = llsdBlock["_region_access"].asInteger();
        llsdBlock["REGIONMATURITY"] = LLViewerRegion::accessToString(regionAccess);
-        
        // we're going to throw the LLSD in there in case anyone ever wants to use it
        LLNotifications::instance().add(notificationID+"_Notify", llsdBlock);
-        
        if (regionAccess == SIM_ACCESS_MATURE)
        {
                if (gAgent.isTeen())
@@ -5138,7 +5134,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
                                llwarns << "attempt_standard_notification: Attempted to read notification parameter data into LLSD but failed:" << llsdRaw << llendl;
                        }
                }
-                
                if (
                        (notificationID == "RegionEntryAccessBlocked") ||
                        (notificationID == "LandClaimAccessBlocked") ||
@@ -5149,32 +5145,32 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
                         (Commented so a grep will find the notification strings, since
                         we construct them on the fly; if you add additional notifications,
                         please update the comment.)
-                         
                         Could throw any of the following notifications:
-                         
                                RegionEntryAccessBlocked
                                RegionEntryAccessBlocked_Notify
                                RegionEntryAccessBlocked_Change
                                RegionEntryAccessBlocked_KB
-                                LandClaimAccessBlocked 
+                                LandClaimAccessBlocked
-                                LandClaimAccessBlocked_Notify 
+                                LandClaimAccessBlocked_Notify
-                                LandClaimAccessBlocked_Change 
+                                LandClaimAccessBlocked_Change
-                                LandClaimAccessBlocked_KB 
+                                LandClaimAccessBlocked_KB
                                LandBuyAccessBlocked
                                LandBuyAccessBlocked_Notify
                                LandBuyAccessBlocked_Change
                                LandBuyAccessBlocked_KB
-                         
-                        -----------------------------------------------------------------------*/ 
+                        -----------------------------------------------------------------------*/
                        if (handle_special_notification(notificationID, llsdBlock))
                        {
                                return true;
                        }
                }
-                
                LLNotifications::instance().add(notificationID, llsdBlock);
                return true;
-        }       
+        }
        return false;
 }
@@ -5184,7 +5180,7 @@ void process_agent_alert_message(LLMessageSystem* msgsystem, void** user_data)
        // make sure the cursor is back to the usual default since the
        // alert is probably due to some kind of error.
        gViewerWindow->getWindow()->resetBusyCount();
-        
        if (!attempt_standard_notification(msgsystem))
        {
                BOOL modal = FALSE;
@@ -5205,7 +5201,7 @@ void process_alert_message(LLMessageSystem *msgsystem, void **user_data)
        // make sure the cursor is back to the usual default since the
        // alert is probably due to some kind of error.
        gViewerWindow->getWindow()->resetBusyCount();
-                
        if (!attempt_standard_notification(msgsystem))
        {
                BOOL modal = FALSE;
@@ -5334,7 +5330,7 @@ void process_mean_collision_alert_message(LLMessageSystem *msgsystem, void **use
 {
        if (gAgent.inPrelude())
        {
-                // In prelude, bumping is OK.  This dialog is rather confusing to 
+                // In prelude, bumping is OK.  This dialog is rather confusing to
                // newbies, so we don't show it.  Drop the packet on the floor.
                return;
        }
@@ -5391,7 +5387,7 @@ void process_frozen_message(LLMessageSystem *msgsystem, void **user_data)
        // alert is probably due to some kind of error.
        gViewerWindow->getWindow()->resetBusyCount();
        BOOL b_frozen;
-        
        msgsystem->getBOOL("FrozenData", "Data", b_frozen);
        // TODO: make being frozen change view
@@ -5410,8 +5406,8 @@ void process_economy_data(LLMessageSystem *msg, void** /*user_data*/)
        S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
-        LL_INFOS_ONCE("Messaging") << "EconomyData message arrived; upload cost is " 
+        LL_INFOS_ONCE("Messaging") << "EconomyData message arrived; upload cost is "
-                                << gHippoGridManager->getConnectedGrid()->getCurrencySymbol() 
+                                << gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
                                << upload_cost << LL_ENDL;
        LLFloaterImagePreview::setUploadAmount(upload_cost);
@@ -5434,13 +5430,13 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
        {
                // check to see if the person we are asking
-                // "'[OBJECTNAME]', an object owned by '[OWNERNAME]', 
+                // "'[OBJECTNAME]', an object owned by '[OWNERNAME]',
-                // located in [REGIONNAME] at [REGIONPOS], 
+                // located in [REGIONNAME] at [REGIONPOS],
                // has been <granted|denied> permission to: [PERMISSIONS]."
                LLUIString notice(LLFloaterChat::getInstance()->getString(granted ? "ScriptQuestionCautionChatGranted" : "ScriptQuestionCautionChatDenied"));
-                // always include the object name and owner name 
+                // always include the object name and owner name
                notice.setArg("[OBJECTNAME]", notification["payload"]["object_name"].asString());
                notice.setArg("[OWNERNAME]", notification["payload"]["owner_name"].asString());
@@ -5452,7 +5448,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
                {
                        // found the viewerobject, get it's position in its region
                        LLVector3 objpos(viewobj->getPosition());
-                        
                        // try to lookup the name of the region the object is in
                        LLViewerRegion* viewregion = viewobj->getRegion();
                        if (viewregion)
@@ -5479,7 +5475,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
                        notice.setArg("[REGIONPOS]", "(unknown position)");
                }
-                // check each permission that was requested, and list each 
+                // check each permission that was requested, and list each
                // permission that has been flagged as a caution permission
                BOOL caution = FALSE;
                S32 count = 0;
@@ -5531,7 +5527,7 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
        {
                new_questions = 0;
                allowed = FALSE;
-        }       
+        }
        LLUUID task_id = notification["payload"]["task_id"].asUUID();
        LLUUID item_id = notification["payload"]["item_id"].asUUID();
@@ -5623,10 +5619,10 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
        {
                throttle_name = taskid.getString();
        }
-        
        // don't display permission requests if this object is muted
        if (LLMuteList::getInstance()->isMuted(taskid)) return;
-        
        // throttle excessive requests from any specific user's scripts
        typedef LLKeyThrottle<std::string> LLStringThrottle;
        static LLStringThrottle question_throttle( LLREQUEST_PERMISSION_THROTTLE_LIMIT, LLREQUEST_PERMISSION_THROTTLE_INTERVAL );
@@ -5663,7 +5659,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
                        {
                                LLStringUtil::format_map_t args;
                                args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
-                                
                                count++;
                                script_question += "    " + LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i], args) + "\n";
@@ -6016,7 +6012,7 @@ void send_group_notice(const LLUUID& group_id,
        {
                bucket_to_send = (U8*) EMPTY_BINARY_BUCKET;
        }
-   
        send_improved_im(
                        group_id,
@@ -6081,7 +6077,7 @@ void handle_lure(const LLUUID& invitee)
 }
 // Prompt for a message to the invited user.
-void handle_lure(LLDynamicArray<LLUUID>& ids) 
+void handle_lure(LLDynamicArray<LLUUID>& ids)
 {
        LLSD edit_args;
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-04 (RLVa-1.0.0a)
@@ -6126,7 +6122,7 @@ void send_improved_im(const LLUUID& to_id,
                                                        U8 offline,
                                                        EInstantMessage dialog,
                                                        const LLUUID& id,
-                                                        U32 timestamp, 
+                                                        U32 timestamp,
                                                        const U8* binary_bucket,
                                                        S32 binary_bucket_size)
 {
@@ -6185,7 +6181,7 @@ void process_user_info_reply(LLMessageSystem* msg, void**)
                LL_WARNS("Messaging") << "process_user_info_reply - "
                                << "wrong agent id." << LL_ENDL;
        }
-        
        BOOL im_via_email;
        msg->getBOOLFast(_PREHASH_UserData, _PREHASH_IMViaEMail, im_via_email);
        std::string email;
@@ -6239,7 +6235,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
        LLSD payload;
-        std::string message; 
+        std::string message;
        std::string first_name;
        std::string last_name;
        std::string title;
@@ -6259,7 +6255,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
        {
                std::vector<LLMute> mutes = LLMuteList::getInstance()->getMutes();
                for (U32 i = 0; i < mutes.size(); i++)
-                {       
+                {
                        //this is almost like saying (mutes[i].mType != LLMute::Object), but more verbose ... -Kaku
                        if (
                                ((mutes[i].mType == LLMute::AGENT)
@@ -6522,7 +6518,7 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
        // remove above two lines and replace with below line
        // to re-enable parcel browser for llMapDestination()
        // LLURLDispatcher::dispatch(LLURLDispatcher::buildSLURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]), FALSE);
-        
 }
 void process_covenant_reply(LLMessageSystem* msg, void**)
@@ -6555,7 +6551,7 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
        LLFloaterBuyLand::updateLastModified(last_modified);
        gCacheName->getName(estate_owner_id, callbackCacheEstateOwnerName);
-        
        // load the actual covenant asset data
        const BOOL high_priority = TRUE;
        if (covenant_id.notNull())
@@ -6593,7 +6589,7 @@ void callbackCacheEstateOwnerName(const LLUUID& id,
                                                                  BOOL is_group, void*)
 {
        std::string name;
-        
        if (id.isNull())
        {
                name = "(none)";
@@ -6617,9 +6613,9 @@ void onCovenantLoadComplete(LLVFS *vfs,
        if(0 == status)
        {
                LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
-                
                S32 file_length = file.getSize();
-                
                char* buffer = new char[file_length+1];
                if (buffer == NULL)
                {
@@ -6628,10 +6624,10 @@ void onCovenantLoadComplete(LLVFS *vfs,
                }
                file.read((U8*)buffer, file_length);            /* Flawfinder: ignore */
-                
                // put a EOS at the end
                buffer[file_length] = 0;
-                
                if( (file_length > 19) && !strncmp( buffer, "Linden text version", 19 ) )
                {
                        LLViewerTextEditor* editor =
@@ -6660,7 +6656,7 @@ void onCovenantLoadComplete(LLVFS *vfs,
        else
        {
                LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-                
                if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
                    LL_ERR_FILE_EMPTY == status)
                {
@@ -6674,7 +6670,7 @@ void onCovenantLoadComplete(LLVFS *vfs,
                {
                        covenant_text = "Unable to load estate covenant at this time.";
                }
-                
                LL_WARNS("Messaging") << "Problem loading notecard: " << status << LL_ENDL;
        }
        LLPanelEstateCovenant::updateCovenantText(covenant_text, asset_uuid);
@@ -6692,7 +6688,7 @@ void process_feature_disabled_message(LLMessageSystem* msg, void**)
        msg->getStringFast(_PREHASH_FailureInfo,_PREHASH_ErrorMessage, messageText,0);
        msg->getUUIDFast(_PREHASH_FailureInfo,_PREHASH_AgentID,agentID);
        msg->getUUIDFast(_PREHASH_FailureInfo,_PREHASH_TransactionID,transactionID);
-        
        LL_WARNS("Messaging") << "Blacklisted Feature Response:" << messageText << LL_ENDL;
 }
diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp
index 0156622..2386631 100644
--- a/linden/indra/newview/llwaterparammanager.cpp
+++ b/linden/indra/newview/llwaterparammanager.cpp
@@ -3,9 +3,9 @@
 * @brief Implementation for the LLWaterParamManager class.
 *
 * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
 * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
+ *
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
 * online at http://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
@@ -69,6 +69,7 @@
 #include "llwlparammanager.h"
 #include "llwaterparamset.h"
+#include "llettherebelight.h"
 #include "llpostprocess.h"
 #include "llfloaterwater.h"
@@ -102,9 +103,9 @@ void LLWaterParamManager::loadAllPresets(const std::string& file_name)
 {
        std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
        LL_DEBUGS2("AppInit", "ShaderLoading") << "Loading Default water settings from " << path_name << LL_ENDL;
-                        
-        bool found = true;                      
+        bool found = true;
-        while(found) 
+        while(found)
        {
                std::string name;
                found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
@@ -128,9 +129,9 @@ void LLWaterParamManager::loadAllPresets(const std::string& file_name)
        std::string path_name2(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", ""));
        LL_DEBUGS2("AppInit", "Shaders") << "Loading User water settings from " << path_name2 << LL_ENDL;
-                        
-        found = true;                   
+        found = true;
-        while(found) 
+        while(found)
        {
                std::string name;
                found = gDirUtilp->getNextFileInDir(path_name2, "*.xml", name, false);
@@ -159,7 +160,7 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
                if(propagate)
                {
                        getParamSet(name, mCurParams);
-                        propagateParameters();
+                        LightShare::apply(&mCurParams, NULL, NULL, WL_SCOPE_USER);
                }
                return;
        }
@@ -174,10 +175,10 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
        std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", escaped_filename));
        LL_DEBUGS2("AppInit", "Shaders") << "Loading water settings from " << pathName << LL_ENDL;
-        
        std::ifstream presetsXML;
        presetsXML.open(pathName.c_str());
-        
        // That failed, try loading from the users area instead.
        if(!presetsXML)
        {
@@ -190,8 +191,8 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
        {
                loadPresetXML(name, presetsXML);
                presetsXML.close();
-        } 
+        }
-        else 
+        else
        {
                llwarns << "Can't find " << name << llendl;
                return;
@@ -200,21 +201,21 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
        if(propagate)
        {
                getParamSet(name, mCurParams);
-                propagateParameters();
+                LightShare::apply(&mCurParams, NULL, NULL, WL_SCOPE_USER);
        }
 }
 bool LLWaterParamManager::loadPresetXML(const std::string& name, std::istream& preset_stream, bool propagate /* = false */, bool check_if_real /* = false */)
 {
        LLSD paramsData(LLSD::emptyMap());
-        
        LLPointer<LLSDParser> parser = new LLSDXMLParser();
-        
        if(parser->parse(preset_stream, paramsData, LLSDSerialize::SIZE_UNLIMITED) == LLSDParser::PARSE_FAILURE)
        {
                return false;
        }
-        
        if(check_if_real)
        {
                static const char* expected_windlight_settings[] = {
@@ -240,17 +241,17 @@ bool LLWaterParamManager::loadPresetXML(const std::string& name, std::istream& p
                        }
                }
        }
-        
        std::map<std::string, LLWaterParamSet>::iterator mIt = mParamList.find(name);
        if(mIt == mParamList.end())
        {
                addParamSet(name, paramsData);
        }
-        else 
+        else
        {
                setParamSet(name, paramsData);
        }
-        
        if(propagate)
        {
                getParamSet(name, mCurParams);
@@ -306,19 +307,19 @@ bool LLWaterParamManager::savePresetToNotecard(const std::string & name)
 {
        // make an empty llsd
        LLSD paramsData(LLSD::emptyMap());
-        
        // fill it with LLSD windlight params
        paramsData = mParamList[name].getAll();
-        
        // get some XML
        std::ostringstream presetsXML;
        LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
        formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY);
-        
        // Write it to a notecard
        LLNotecard notecard;
        notecard.setText(presetsXML.str());
-        
        LLInventoryItem *item = gInventory.getItem(mParamList[name].mInventoryID);
        if(!item)
        {
@@ -332,13 +333,13 @@ bool LLWaterParamManager::savePresetToNotecard(const std::string & name)
                LLAssetID asset_id;
                tid.generate();
                asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
-                
                LLVFile file(gVFS, asset_id, LLAssetType::AT_NOTECARD, LLVFile::APPEND);
-                
                std::ostringstream stream;
                notecard.exportStream(stream);
                std::string buffer = stream.str();
-                
                S32 size = buffer.length() + 1;
                file.setMaxSize(size);
                file.write((U8*)buffer.c_str(), size);
@@ -351,7 +352,7 @@ bool LLWaterParamManager::savePresetToNotecard(const std::string & name)
                LL_WARNS("WindLight") << "Stuff the legacy system." << LL_ENDL;
                return false;
        }
-        
        propagateParameters();
        return true;
 }
@@ -374,8 +375,8 @@ void LLWaterParamManager::propagateParameters(void)
        }
        bool err;
-        F32 fog_density_slider = 
+        F32 fog_density_slider =
-                log(mCurParams.getFloat(mFogDensity.mName, err)) / 
+                log(mCurParams.getFloat(mFogDensity.mName, err)) /
                log(mFogDensity.mBase);
        setDensitySliderValue(fog_density_slider);
@@ -398,12 +399,12 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader)
 void LLWaterParamManager::update(LLViewerCamera * cam)
 {
        LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM);
-        
        // update the shaders and the menu
        propagateParameters();
-        
        // sync menus if they exist
-        if(LLFloaterWater::isOpen()) 
+        if(LLFloaterWater::isOpen())
        {
                LLFloaterWater::instance()->syncMenu();
        }
@@ -411,12 +412,12 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
        stop_glerror();
        // only do this if we're dealing with shaders
-        if(gPipeline.canUseVertexShaders()) 
+        if(gPipeline.canUseVertexShaders())
        {
                //transform water plane to eye space
                glh::vec3f norm(0.f, 0.f, 1.f);
                glh::vec3f p(0.f, 0.f, gAgent.getRegion()->getWaterHeight()+0.1f);
-                
                F32 modelView[16];
                for (U32 i = 0; i < 16; i++)
                {
@@ -434,13 +435,13 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
                mWaterPlane = LLVector4(enorm.v[0], enorm.v[1], enorm.v[2], -ep.dot(enorm));
                LLVector3 sunMoonDir;
-                if (gSky.getSunDirection().mV[2] > NIGHTTIME_ELEVATION_COS)      
+                if (gSky.getSunDirection().mV[2] > NIGHTTIME_ELEVATION_COS)
-                {        
+                {
-                        sunMoonDir = gSky.getSunDirection();     
+                        sunMoonDir = gSky.getSunDirection();
-                }        
+                }
-                else     
+                else
-                {        
+                {
-                        sunMoonDir = gSky.getMoonDirection();    
+                        sunMoonDir = gSky.getMoonDirection();
                }
                sunMoonDir.normVec();
                mWaterFogKS = 1.f/llmax(sunMoonDir.mV[2], WATER_FOG_LIGHT_CLAMP);
@@ -510,8 +511,8 @@ bool LLWaterParamManager::addParamSet(const std::string& name, LLWaterParamSet&
 {
        // add a new one if not one there already
        std::map<std::string, LLWaterParamSet>::iterator mIt = mParamList.find(name);
-        if(mIt == mParamList.end()) 
+        if(mIt == mParamList.end())
-        {       
+        {
                mParamList[name] = param;
                return true;
        }
@@ -538,7 +539,7 @@ bool LLWaterParamManager::getParamSet(const std::string& name, LLWaterParamSet&
 {
        // find it and set it
        std::map<std::string, LLWaterParamSet>::iterator mIt = mParamList.find(name);
-        if(mIt != mParamList.end()) 
+        if(mIt != mParamList.end())
        {
                param = mParamList[name];
                param.mName = name;
@@ -558,11 +559,11 @@ bool LLWaterParamManager::setParamSet(const std::string& name, LLWaterParamSet&
 bool LLWaterParamManager::setParamSet(const std::string& name, const LLSD & param)
 {
        // quick, non robust (we won't be working with files, but assets) check
-        if(!param.isMap()) 
+        if(!param.isMap())
        {
                return false;
        }
-        
        mParamList[name].setAll(param);
        return true;
@@ -572,7 +573,7 @@ bool LLWaterParamManager::removeParamSet(const std::string& name, bool delete_fr
 {
        // remove from param list
        std::map<std::string, LLWaterParamSet>::iterator mIt = mParamList.find(name);
-        if(mIt != mParamList.end()) 
+        if(mIt != mParamList.end())
        {
                mParamList.erase(mIt);
        }
@@ -581,13 +582,13 @@ bool LLWaterParamManager::removeParamSet(const std::string& name, bool delete_fr
        {
                std::string path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", ""));
-                
                // use full curl escaped name
                char * curl_str = curl_escape(name.c_str(), name.size());
                std::string escaped_name(curl_str);
                curl_free(curl_str);
                curl_str = NULL;
-                
                gDirUtilp->deleteFilesInDir(path_name, escaped_name + ".xml");
        }
@@ -599,7 +600,7 @@ F32 LLWaterParamManager::getFogDensity(void)
        bool err;
        F32 fogDensity = mCurParams.getFloat("waterFogDensity", err);
-        
        // modify if we're underwater
        const F32 water_height = gAgent.getRegion() ? gAgent.getRegion()->getWaterHeight() : 0.f;
        F32 camera_height = gAgent.getCameraPositionAgent().mV[2];
@@ -659,7 +660,7 @@ void LLWaterParamManager::loadWaterNotecard(LLVFS *vfs, const LLUUID& asset_id,
                }
                else
                {
-                        // We can do this because we know mCurParams 
+                        // We can do this because we know mCurParams
                        sInstance->mParamList[name].mInventoryID = inventory_id;
                }
        }
diff --git a/linden/indra/newview/llwaterparamset.h b/linden/indra/newview/llwaterparamset.h
index efbad31..09da42b 100644
--- a/linden/indra/newview/llwaterparamset.h
+++ b/linden/indra/newview/llwaterparamset.h
@@ -47,12 +47,14 @@ class LLWaterParamSet;
 class LLWaterParamSet 
 {
        friend class LLWaterParamManager;
+        friend class LLWLParamManager;
+        friend class LightShare;
 public:
        std::string mName;
        LLUUID mInventoryID;
        
-private:
+protected:
        LLSD mParamValues;
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 8007cce..59de0ad 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -3,9 +3,9 @@
 * @brief Implementation for the LLWLParamManager class.
 *
 * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
 * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
+ *
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
 * online at http://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
@@ -33,6 +33,8 @@
 #include "llviewerprecompiledheaders.h"
 #include "llwlparammanager.h"
+#include "llwaterparammanager.h"
+#include "llettherebelight.h"
 #include "pipeline.h"
 #include "llsky.h"
@@ -60,6 +62,7 @@
 #include "llfloaterdaycycle.h"
 #include "llfloaterenvsettings.h"
+#include "llworld.h"
 // For notecard loading
 #include "llvfile.h"
@@ -124,9 +127,9 @@ void LLWLParamManager::loadPresets(const std::string& file_name)
 {
        std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
        LL_DEBUGS2("AppInit", "ShaderLoading") << "Loading Default WindLight settings from " << path_name << LL_ENDL;
-                        
-        bool found = true;                      
+        bool found = true;
-        while(found) 
+        while(found)
        {
                std::string name;
                found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
@@ -150,9 +153,9 @@ void LLWLParamManager::loadPresets(const std::string& file_name)
        std::string path_name2(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", ""));
        LL_INFOS2("AppInit", "Shaders") << "Loading User WindLight settings from " << path_name2 << LL_ENDL;
-                        
-        found = true;                   
+        found = true;
-        while(found) 
+        while(found)
        {
                std::string name;
                found = gDirUtilp->getNextFileInDir(path_name2, "*.xml", name, false);
@@ -176,14 +179,14 @@ void LLWLParamManager::loadPresets(const std::string& file_name)
 bool LLWLParamManager::loadPresetXML(const std::string& name, std::istream& preset_stream, bool propagate /* = false */, bool check_if_real /* = false */)
 {
        LLSD paramsData(LLSD::emptyMap());
-        
        LLPointer<LLSDParser> parser = new LLSDXMLParser();
-        
        if(parser->parse(preset_stream, paramsData, LLSDSerialize::SIZE_UNLIMITED) == LLSDParser::PARSE_FAILURE)
        {
                return false;
        }
-        
        if(check_if_real)
        {
                static const char* expected_windlight_settings[] = {
@@ -220,13 +223,13 @@ bool LLWLParamManager::loadPresetXML(const std::string& name, std::istream& pres
                        }
                }
        }
-        
        std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.find(name);
        if(mIt == mParamList.end())
        {
                addParamSet(name, paramsData);
        }
-        else 
+        else
        {
                setParamSet(name, paramsData);
        }
@@ -258,12 +261,12 @@ void LLWLParamManager::savePresets(const std::string & fileName)
        //and not over the RO system wide version.
        LLSD paramsData(LLSD::emptyMap());
-        
        std::string pathName(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", fileName));
        for(std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.begin();
                mIt != mParamList.end();
-                ++mIt) 
+                ++mIt)
        {
                paramsData[mIt->first] = mIt->second.getAll();
        }
@@ -295,7 +298,7 @@ bool LLWLParamManager::savePresetToNotecard(const std::string & name)
        // Write it to a notecard
        LLNotecard notecard;
        notecard.setText(presetsXML.str());
- 
        LLInventoryItem *item = gInventory.getItem(mParamList[name].mInventoryID);
        if(!item)
        {
@@ -309,13 +312,13 @@ bool LLWLParamManager::savePresetToNotecard(const std::string & name)
                LLAssetID asset_id;
                tid.generate();
                asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
-                
                LLVFile file(gVFS, asset_id, LLAssetType::AT_NOTECARD, LLVFile::APPEND);
-                
                std::ostringstream stream;
                notecard.exportStream(stream);
                std::string buffer = stream.str();
-                
                S32 size = buffer.length() + 1;
                file.setMaxSize(size);
                file.write((U8*)buffer.c_str(), size);
@@ -328,7 +331,7 @@ bool LLWLParamManager::savePresetToNotecard(const std::string & name)
                LL_WARNS("WindLight") << "Stuff the legacy system." << LL_ENDL;
                return false;
        }
-        
        propagateParameters();
        return true;
 }
@@ -341,7 +344,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
                if(propagate)
                {
                        getParamSet(name, mCurParams);
-                        propagateParameters();
+                        LightShare::apply(NULL, NULL, &mCurParams, WL_SCOPE_USER);
                }
                return;
        }
@@ -355,7 +358,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
        escaped_filename += ".xml";
        std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", escaped_filename));
-        LL_DEBUGS2("AppInit", "Shaders") << "Loading WindLight sky setting from " << pathName << LL_ENDL; 
+        LL_DEBUGS2("AppInit", "Shaders") << "Loading WindLight sky setting from " << pathName << LL_ENDL;
        llifstream presetsXML;
        presetsXML.open(pathName.c_str());
@@ -364,7 +367,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
        if(!presetsXML)
        {
                pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", escaped_filename);
-                LL_DEBUGS2("AppInit", "Shaders")<< "Loading User WindLight sky setting from "  << LL_ENDL; 
+                LL_DEBUGS2("AppInit", "Shaders")<< "Loading User WindLight sky setting from "  << LL_ENDL;
                presetsXML.open(pathName.c_str());
        }
@@ -372,22 +375,22 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
        {
                loadPresetXML(name, presetsXML);
                presetsXML.close();
-        } 
+        }
-        else 
+        else
        {
                llwarns << "Can't find " << name << llendl;
                return;
        }
-        
        if(propagate)
        {
                getParamSet(name, mCurParams);
-                propagateParameters();
+                LightShare::apply(NULL, NULL, &mCurParams, WL_SCOPE_USER);
        }
        notifyObservers();
-}       
+}
 void LLWLParamManager::savePreset(const std::string & name)
 {
@@ -427,7 +430,7 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
        {
                shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, mRotatedLightDir.mV);
                shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV);
-        } 
+        }
        else if (shader->mShaderGroup == LLGLSLShader::SG_SKY)
        {
@@ -435,13 +438,13 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
        }
        shader->uniform1f("scene_light_strength", mSceneLightStrength);
-        
 }
 void LLWLParamManager::propagateParameters(void)
 {
        LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM);
-        
        LLVector4 sunDir;
        LLVector4 moonDir;
@@ -491,7 +494,7 @@ void LLWLParamManager::propagateParameters(void)
        // bind the variables for all shaders only if we're using WindLight
        LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
        end_shaders = LLViewerShaderMgr::instance()->endShaders();
-        for(shaders_iter = LLViewerShaderMgr::instance()->beginShaders(); shaders_iter != end_shaders; ++shaders_iter) 
+        for(shaders_iter = LLViewerShaderMgr::instance()->beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
        {
                if (shaders_iter->mProgramObject != 0
                        && (gPipeline.canUseWindLightShaders()
@@ -512,29 +515,29 @@ void LLWLParamManager::propagateParameters(void)
 void LLWLParamManager::update(LLViewerCamera * cam)
 {
        LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM);
-        
        // update clouds, sun, and general
        mCurParams.updateCloudScrolling();
-        
        // update only if running
-        if(mAnimator.mIsRunning) 
+        if(mAnimator.mIsRunning)
        {
                mAnimator.update(mCurParams);
        }
        // update the shaders and the menu
        propagateParameters();
-        
        // sync menus if they exist
-        if(LLFloaterWindLight::isOpen()) 
+        if(LLFloaterWindLight::isOpen())
        {
                LLFloaterWindLight::instance()->syncMenu();
        }
-        if(LLFloaterDayCycle::isOpen()) 
+        if(LLFloaterDayCycle::isOpen())
        {
                LLFloaterDayCycle::instance()->syncMenu();
        }
-        if(LLFloaterEnvSettings::isOpen()) 
+        if(LLFloaterEnvSettings::isOpen())
        {
                LLFloaterEnvSettings::instance()->syncMenu();
        }
@@ -547,8 +550,8 @@ void LLWLParamManager::update(LLViewerCamera * cam)
        // executed some of the time.  For example for water shaders only.
        {
                F32 camYawDelta = mSunDeltaYaw * DEG_TO_RAD;
-                
-                LLVector3 lightNorm3(mLightDir);        
+                LLVector3 lightNorm3(mLightDir);
                lightNorm3 *= LLQuaternion(-(camYaw + camYawDelta), LLVector3(0.f, 1.f, 0.f));
                mRotatedLightDir = LLVector4(lightNorm3, 0.f);
@@ -621,7 +624,7 @@ void LLWLParamManager::cleanupClass()
 void LLWLParamManager::resetAnimator(F32 curTime, bool run)
 {
-        mAnimator.setTrack(mDay.mTimeMap, mDay.mDayRate, 
+        mAnimator.setTrack(mDay.mTimeMap, mDay.mDayRate,
                curTime, run);
        return;
@@ -630,8 +633,8 @@ bool LLWLParamManager::addParamSet(const std::string& name, LLWLParamSet& param)
 {
        // add a new one if not one there already
        std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.find(name);
-        if(mIt == mParamList.end()) 
+        if(mIt == mParamList.end())
-        {       
+        {
                mParamList[name] = param;
                return true;
        }
@@ -658,7 +661,7 @@ bool LLWLParamManager::getParamSet(const std::string& name, LLWLParamSet& param)
 {
        // find it and set it
        std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.find(name);
-        if(mIt != mParamList.end()) 
+        if(mIt != mParamList.end())
        {
                param = mParamList[name];
                param.mName = name;
@@ -678,11 +681,11 @@ bool LLWLParamManager::setParamSet(const std::string& name, LLWLParamSet& param)
 bool LLWLParamManager::setParamSet(const std::string& name, const LLSD & param)
 {
        // quick, non robust (we won't be working with files, but assets) check
-        if(!param.isMap()) 
+        if(!param.isMap())
        {
                return false;
        }
-        
        mParamList[name].setAll(param);
        return true;
@@ -692,7 +695,7 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
 {
        // remove from param list
        std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.find(name);
-        if(mIt != mParamList.end()) 
+        if(mIt != mParamList.end())
        {
                mParamList.erase(mIt);
        }
@@ -701,11 +704,11 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
        // remove all references
        bool stat = true;
-        do 
+        do
        {
                // get it
                stat = mDay.getKey(name, key);
-                if(stat == false) 
+                if(stat == false)
                {
                        break;
                }
@@ -714,17 +717,17 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
                stat = mDay.removeKey(key);
        } while(stat == true);
-        
        if(delete_from_disk)
        {
                std::string path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", ""));
-                
                // use full curl escaped name
                char * curl_str = curl_escape(name.c_str(), name.size());
                std::string escaped_name(curl_str);
                curl_free(curl_str);
                curl_str = NULL;
-                
                gDirUtilp->deleteFilesInDir(path_name, escaped_name + ".xml");
        }
@@ -797,7 +800,7 @@ void LLWLParamManager::loadWindlightNotecard(LLVFS *vfs, const LLUUID& asset_id,
                }
                else
                {
-                        // We can do this because we know mCurParams 
+                        // We can do this because we know mCurParams
                        sInstance->mParamList[name].mInventoryID = inventory_id;
                }
        }
@@ -836,3 +839,21 @@ void LLWLParamManager::notifyObservers()
                observer->changed();
        }
 }
+// static
+bool LLWLParamManager::isWaterSettingsNotecard(std::string name)
+{
+        return (name.length() > 2 && name.compare(name.length() - 3, 3, ".ww") == 0);
+}
+// static
+bool LLWLParamManager::isSkySettingsNotecard(std::string name)
+{
+        return (name.length() > 2 && name.compare(name.length() - 3, 3, ".wl") == 0);
+}
+// static
+bool LLWLParamManager::isSettingsNotecard(std::string name)
+{
+        return (isSkySettingsNotecard(name) || isWaterSettingsNotecard(name));
+}
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index fc1127e..034b2e6 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -3,9 +3,9 @@
 * @brief Implementation for the LLWLParamManager class.
 *
 * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
 * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
+ *
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
 * online at http://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
@@ -36,6 +36,7 @@
 #include <vector>
 #include <map>
 #include "llwlparamset.h"
+#include "llwaterparamset.h"
 #include "llwlanimator.h"
 #include "llwldaycycle.h"
 #include "llviewercamera.h"
@@ -51,10 +52,10 @@ public:
        virtual ~LLWLPresetsObserver() { };
        virtual void changed() = 0;
 };
- 
 // color control
 struct WLColorControl {
-        
        F32 r, g, b, i;                         /// the values
        std::string mName;                      /// name to use to dereference params
        std::string mSliderName;        /// name of the slider in menu
@@ -88,7 +89,7 @@ struct WLColorControl {
                r = val.mV[0];
                g = val.mV[1];
                b = val.mV[2];
-                i = val.mV[3];          
+                i = val.mV[3];
                return *this;
        }
@@ -131,6 +132,7 @@ struct WLFloatControl {
        }
 };
 /// WindLight parameter manager class - what controls all the wind light shaders
 class LLWLParamManager
 {
@@ -151,19 +153,19 @@ public:
        /// load an individual preset into the sky from an LLSD stream
        /// Returns whether the stream was actually reasonable XML to load from.
        bool loadPresetXML(const std::string& name, std::istream& preset_stream, bool propogate=false, bool check_if_real=false);
-        
        /// Load an individual preset from a notecard.
        void loadPresetNotecard(const std::string& name, const LLUUID& asset_id, const LLUUID& inv_id);
-        
        /// save the parameter presets to file
        void savePreset(const std::string & name);
-        
        /// save the parameter presets to file
        bool savePresetToNotecard(const std::string & name);
        /// Set shader uniforms dirty, so they'll update automatically.
        void propagateParameters(void);
-        
        /// Update shader uniforms that have changed.
        void updateShaderUniforms(LLGLSLShader * shader);
@@ -181,7 +183,7 @@ public:
        // get where the light is pointing
        inline LLVector4 getRotatedLightDir(void) const;
-        
        /// get the dome's offset
        inline F32 getDomeOffset(void) const;
@@ -193,7 +195,7 @@ public:
        // Cleanup of global data that's only inited once per class.
        static void cleanupClass();
-        
        /// add a param to the list
        bool addParamSet(const std::string& name, LLWLParamSet& param);
@@ -205,9 +207,9 @@ public:
        /// set the param in the list with a new param
        bool setParamSet(const std::string& name, LLWLParamSet& param);
-        
        /// set the param in the list with a new param
-        bool setParamSet(const std::string& name, LLSD const & param);  
+        bool setParamSet(const std::string& name, LLSD const & param);
        /// gets rid of a parameter and any references to it
        /// returns true if successful
@@ -223,6 +225,11 @@ public:
        void SetMixTime(LLWLParamSet* mixSet, F32 mixTime);
+        // Notecard settings checkers.
+        static bool isWaterSettingsNotecard(std::string name);
+        static bool isSkySettingsNotecard(std::string name);
+        static bool isSettingsNotecard(std::string name);
 public:
        // helper variables
@@ -249,7 +256,7 @@ public:
        WLFloatControl mWLGamma;
        F32 mSceneLightStrength;
-        
        /// Atmospherics
        WLColorControl mBlueHorizon;
        WLColorControl mHazeDensity;
@@ -275,10 +282,10 @@ public:
        /// sky dome
        F32 mDomeOffset;
        F32 mDomeRadius;
-        
        // list of all the parameters, listed by name
-        std::map<std::string, LLWLParamSet> mParamList; 
+        std::map<std::string, LLWLParamSet> mParamList;
-        
 private:
        // our parameter manager singleton instance
        static LLWLParamManager * sInstance;
@@ -287,11 +294,10 @@ private:
        LLWLParamSet* sMixSet;
        F32 sMixTime;
        F32 sMixCount;
-        
        static std::vector<LLWLPresetsObserver*> sObservers;
        static void loadWindlightNotecard(LLVFS *vfs, const LLUUID& asset_id, LLAssetType::EType asset_type, void *user_data, S32 status, LLExtStat ext_status);
 };
 inline F32 LLWLParamManager::getDomeOffset(void) const
diff --git a/linden/indra/newview/llwlparamset.h b/linden/indra/newview/llwlparamset.h
index 038490d..ce01f84 100644
--- a/linden/indra/newview/llwlparamset.h
+++ b/linden/indra/newview/llwlparamset.h
@@ -3,9 +3,9 @@
 * @brief Interface for the LLWLParamSet class.
 *
 * $LicenseInfo:firstyear=2005&license=viewergpl$
- * 
+ *
 * Copyright (c) 2005-2009, Linden Research, Inc.
- * 
+ *
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
 * online at http://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
@@ -46,16 +46,16 @@ class LLWLParamSet;
 /// A class representing a set of parameter values for the WindLight shaders.
 class LLWLParamSet {
-        friend class LLWLParamManager;
+        friend class LightShare;
 public:
        std::string mName;
        LLUUID mInventoryID;
-        
-private:
+protected:
        LLSD mParamValues;
-        
        float mCloudScrollXOffset, mCloudScrollYOffset;
 public:
@@ -67,10 +67,10 @@ public:
        /// set the total llsd
        void setAll(const LLSD& val);
-        
        /// get the total llsd
-        const LLSD& getAll();           
+        const LLSD& getAll();
-        
        /// Set a float parameter.
        /// \param paramName    The name of the parameter to set.
@@ -120,61 +120,61 @@ public:
        /// Get an integer parameter
        /// \param paramName    The name of the parameter to set.
-        /// \param error                A flag to set if it's not the proper return type        
+        /// \param error                A flag to set if it's not the proper return type
        F32 getFloat(const std::string& paramName, bool& error);
-        
-        
        // specific getters and setters
-        
-        
        /// set the star's brightness
        /// \param val brightness value
        void setStarBrightness(F32 val);
-        
        /// get the star brightness value;
-        F32 getStarBrightness();        
+        F32 getStarBrightness();
-        
        void setSunAngle(F32 val);
-        F32 getSunAngle();      
+        F32 getSunAngle();
-        
        void setEastAngle(F32 val);
-        F32 getEastAngle();     
+        F32 getEastAngle();
-        
-                                                        
-        
        /// set the cloud scroll x enable value
-        /// \param val scroll x value   
+        /// \param val scroll x value
        void setEnableCloudScrollX(bool val);
-        /// get the scroll x enable value;      
+        /// get the scroll x enable value;
        bool getEnableCloudScrollX();
-        
        /// set the star's brightness
-        /// \param val scroll y bool value              
+        /// \param val scroll y bool value
-        void setEnableCloudScrollY(bool val);   
+        void setEnableCloudScrollY(bool val);
        /// get the scroll enable y value;
        bool getEnableCloudScrollY();
-        
        /// set the cloud scroll x enable value
-        /// \param val scroll x value   
+        /// \param val scroll x value
        void setCloudScrollX(F32 val);
-        /// get the scroll x enable value;      
+        /// get the scroll x enable value;
        F32 getCloudScrollX();
-        
        /// set the star's brightness
-        /// \param val scroll y bool value              
+        /// \param val scroll y bool value
-        void setCloudScrollY(F32 val);  
+        void setCloudScrollY(F32 val);
        /// get the scroll enable y value;
-        F32 getCloudScrollY();  
+        F32 getCloudScrollY();
        /// interpolate two parameter sets
        /// \param src                  The parameter set to start with
        /// \param dest                 The parameter set to end with
        /// \param weight               The amount to interpolate
-        void mix(LLWLParamSet& src, LLWLParamSet& dest, 
+        void mix(LLWLParamSet& src, LLWLParamSet& dest,
                F32 weight);
        void updateCloudScrolling(void);
diff --git a/linden/indra/newview/windlightsettingsupdate.cpp b/linden/indra/newview/windlightsettingsupdate.cpp
deleted file mode 100644
index ad6e7c9..0000000
--- a/linden/indra/newview/windlightsettingsupdate.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * @file kowopenregionsettings.cpp
- * @brief Handler for OpenRegionInfo event queue message.
- *
- * Copyright (c) 2010, Patrick Sapinski
- *
- * 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 "llviewerprecompiledheaders.h"
-#include "llhttpnode.h"
-#include "hippolimits.h"
-#include "llfloatertools.h"
-#include "llviewercontrol.h"
-#include "llagent.h"
-#include "llsurface.h"
-#include "llviewerregion.h"
-#include "llviewerobject.h"
-#include "linden_common.h"
-#include "llwaterparammanager.h"
-#include "llwaterparamset.h"
-#include "llwlparammanager.h"
-#include "llwlparamset.h"
-#include "message.h"
-#include "meta7windlight.h"
-#include "lightshare.h"
-#include "wlsettingsmanager.h"
-//DEBUG includes
-//#include "llsdserialize.h" //LLSDNotationStreamer - for dumping LLSD to string
-class WindLightSettingsUpdate : public LLHTTPNode
-{
-        /*virtual*/ void post(
-                LLHTTPNode::ResponsePtr response,
-                const LLSD& context,
-                const LLSD& input) const
-        {
-                if (!input.isMap() || !input.has("body"))
-                {
-                        llinfos << "malformed WindLightSettingsUpdate update!" << llendl;        
-                        return;
-                }
-                LLWaterParamSet* mWater;
-                LLWLParamSet* mSky;
-                LLUUID* mWaterNormal;
-                mWater = new LLWaterParamSet();
-                mSky = new LLWLParamSet();
-                mWaterNormal = new LLUUID();
-                LLSD body = input["body"];
-                
-                mWater->set("waterFogColor",
-                        body["waterColorX"].asReal()   / 256.f,
-                        body["waterColorY"].asReal()   / 256.f,
-                        body["waterColorZ"].asReal()   / 256.f,
-                        body["waterColorW"].asReal()   / 256.f);
-                mWater->set("waterFogDensity", body["waterFogDensityExponent"].asReal());
-                mWater->set("underWaterFogMod", body["underwaterFogModifier"].asReal());
-                mWater->set("normScale", body["reflectionWaveletScaleX"].asReal(),
-                        body["reflectionWaveletScaleY"].asReal(),
-                        body["reflectionWaveletScaleZ"].asReal());
-                mWater->set("fresnelScale", body["fresnelScale"].asReal());
-                mWater->set("fresnelOffset", body["fresnelOffset"].asReal());
-                mWater->set("scaleAbove", body["refractScaleAbove"].asReal());
-                mWater->set("scaleBelow", body["refractScaleBelow"].asReal());
-                mWater->set("blurMultiplier", body["blurMultiplier"].asReal());
-                mWater->set("wave2Dir", body["bigWaveDirectionX"].asReal(),
-                        body["bigWaveDirectionY"].asReal());
-                mWater->set("wave1Dir", body["littleWaveDirectionX"].asReal(),
-                        body["littleWaveDirectionY"].asReal());
-                mWaterNormal->parseUUID(body["normalMapTexture"].asUUID().asString(), mWaterNormal);
-                mSky->setSunAngle(body["sunMoonPosition"].asReal());
-                mSky->setEastAngle(body["eastAngle"].asReal());
-                mSky->set("sunlight_color",
-                                                body["sunMoonColorX"].asReal() * 3.0f,
-                                                body["sunMoonColorY"].asReal() * 3.0f,
-                                                body["sunMoonColorZ"].asReal() * 3.0f,
-                                                body["sunMoonColorW"].asReal() * 3.0f);
-                mSky->set("ambient",
-                                                body["ambientX"].asReal() * 3.0f,
-                                                body["ambientY"].asReal() * 3.0f,
-                                                body["ambientZ"].asReal() * 3.0f,
-                                                body["ambientW"].asReal() * 3.0f);
-                mSky->set("blue_horizon",
-                                                body["horizonX"].asReal() * 2.0f,
-                                                body["horizonY"].asReal() * 2.0f,
-                                                body["horizonZ"].asReal() * 2.0f,
-                                                body["horizonW"].asReal() * 2.0f);
-                mSky->set("blue_density",
-                                                body["blueDensityX"].asReal(),
-                                                body["blueDensityY"].asReal(),
-                                                body["blueDensityZ"].asReal(),
-                                                1.0);
-                mSky->set("haze_horizon",
-                                                body["hazeHorizon"].asReal(),
-                                                body["hazeHorizon"].asReal(),
-                                                body["hazeHorizon"].asReal(),
-                                                1.f);
-                mSky->set("haze_density",
-                                                body["hazeDensity"].asReal(),
-                                                0.f, 0.f, 1.f);
-                mSky->set("cloud_shadow",
-                                                body["cloudCoverage"].asReal(),
-                                                0.f, 0.f, 1.f);
-                mSky->set("density_multiplier",
-                                                body["densityMultiplier"].asReal() / 1000.0f,
-                                                0.f, 0.f, 1.f);
-                mSky->set("distance_multiplier",
-                                                body["distanceMultiplier"].asReal(),
-                                                0.f, 0.f, 1.f);
-                mSky->set("max_y",
-                                                body["maxAltitude"].asReal(),
-                                                0.f, 0.f, 1.f);
-                mSky->set("cloud_color",
-                                                body["cloudColorX"].asReal(),
-                                                body["cloudColorY"].asReal(),
-                                                body["cloudColorZ"].asReal(),
-                                                body["cloudColorW"].asReal());
-                mSky->set("cloud_pos_density1",
-                                                body["cloudXYDensityX"].asReal(),
-                                                body["cloudXYDensityY"].asReal(),
-                                                body["cloudXYDensityZ"].asReal(),
-                                                1.f);
-                mSky->set("cloud_pos_density2",
-                                                body["cloudDetailXYDensityX"].asReal(),
-                                                body["cloudDetailXYDensityY"].asReal(),
-                                                body["cloudDetailXYDensityZ"].asReal(),
-                                                1.f);
-                mSky->set("cloud_scale",
-                                                body["cloudScale"].asReal(),
-                                                0.f, 0.f, 1.f);
-                mSky->set("gamma",
-                                                body["sceneGamma"].asReal(),
-                                                0.f, 0.f, 1.f);
-                mSky->set("glow",
-                                                (2 - body["sunGlowSize"].asReal()) * 20,
-                                                0.f,
-                                                -body["sunGlowFocus"].asReal() * 5,
-                                                1.f);
-        mSky->setCloudScrollX(body["cloudScrollX"].asReal() + 10.0f);
-        mSky->setCloudScrollY(body["cloudScrollY"].asReal() + 10.0f);
-        mSky->setEnableCloudScrollX(!body["cloudScrollXLock"].asBoolean());
-        mSky->setEnableCloudScrollY(!body["cloudScrollYLock"].asBoolean());
-        mSky->setStarBrightness(body["starBrightness"].asReal());
-        mSky->set("fade", body["fade"].asReal());
-        //Update this here.. since it isn't a part of WL... go figure
-        gHippoLimits->skyUseClassicClouds = body["drawClassicClouds"].asBoolean();
-        gSavedSettings.setF32("ClassicCloudHeight",body["classicCloudHeight"].asReal());
-        gSavedSettings.setF32("ClassicCloudRange",body["classicCloudRange"].asReal());
-        WLSettingsManager::Apply(mSky, mWater, mWaterNormal);
-}
-};
-LLHTTPRegistration<WindLightSettingsUpdate>
-gHTTPRegistrationWindLightSettingsUpdate(
-        "/message/WindLightSettingsUpdate");
-\ No newline at end of file
diff --git a/linden/indra/newview/wlfloatermanager.cpp b/linden/indra/newview/wlfloatermanager.cpp
index 63abe14..382244d 100644
--- a/linden/indra/newview/wlfloatermanager.cpp
+++ b/linden/indra/newview/wlfloatermanager.cpp
@@ -1,11 +1,11 @@
-/** 
+/**
 * @file wlfloaterwindlightsend.cpp
 * @brief WLFloaterWindLightSend class definition
 *
 * $LicenseInfo:firstyear=2007&license=viewergpl$
-* 
+*
 * Copyright (c) 2007-2009, Linden Research, Inc.
-* 
+*
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
 * online at http://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
@@ -70,17 +70,17 @@
 #include "llviewerparcelmgr.h"
 #include "llparcel.h"
 #include "wlretrievesettings.h"
-#include "wlsettingsmanager.h"
+#include "llettherebelight.h"
 #include "wlfloaterwindlightsend.h"
 #undef max
 WLFloaterManager* WLFloaterManager::sWindLight;
-std::map<std::string, LLWLParamSet*> WLFloaterManager::mWLParamList;    
+std::map<std::string, LLWLParamSet*> WLFloaterManager::mWLParamList;
-std::map<std::string, LLWaterParamSet*> WLFloaterManager::mWaterParamList;      
+std::map<std::string, LLWaterParamSet*> WLFloaterManager::mWaterParamList;
-std::map<std::string, LLUUID*> WLFloaterManager::mWaterNormalParamList; 
+std::map<std::string, LLUUID*> WLFloaterManager::mWaterNormalParamList;
-std::map<std::string, LLSD> WLFloaterManager::mMinAltParamList; 
+std::map<std::string, LLSD> WLFloaterManager::mMinAltParamList;
-std::map<std::string, LLSD> WLFloaterManager::mMaxAltParamList; 
+std::map<std::string, LLSD> WLFloaterManager::mMaxAltParamList;
-std::map<std::string, LLSD> WLFloaterManager::mFadeParamList;   
+std::map<std::string, LLSD> WLFloaterManager::mFadeParamList;
 WLFloaterManager::WLFloaterManager() : LLFloater(std::string("windlight manager floater"))
 {
@@ -214,7 +214,7 @@ void WLFloaterManager::onShow(void* userData)
        LLWaterParamSet* mWater = mgr->mWaterParamList[name];
        LLUUID* mWaterNormal = mgr->mWaterNormalParamList[name];
        if(mSky != NULL && mWater != NULL && mWaterNormal != NULL)
-                WLSettingsManager::Apply(mSky, mWater, mWaterNormal);
+                LightShare::applyMaybe(mWater, mWaterNormal, mSky);
 }
 void WLFloaterManager::onSetToCurrent(void* userData)
 {
@@ -233,10 +233,10 @@ void WLFloaterManager::onSetToCurrent(void* userData)
        if(name == "(Region Settings)")
        {
                type = 0;
-        }       
+        }
-        
        if(mSky != NULL && mWater != NULL && mWaterNormal != NULL)
-                WLFloaterWindLightSend::SendSettings(false, type, NULL, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal); 
+                WLFloaterWindLightSend::SendSettings(false, type, NULL, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal);
 }
 void WLFloaterManager::onRemove(void* userData)
 {
@@ -258,7 +258,7 @@ void WLFloaterManager::onRemove(void* userData)
        }
        if(mSky != NULL && mWater != NULL && mWaterNormal != NULL)
-                WLFloaterWindLightSend::SendSettings(true, type, false, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal); 
+                WLFloaterWindLightSend::SendSettings(true, type, false, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal);
 }
@@ -269,13 +269,12 @@ void WLFloaterManager::UpdateFloater()
        LLComboBox* comboBox = mgr->getChild<LLComboBox>("WLSettingsCombo");
        comboBox->clear();
        comboBox->removeall();
-        std::map<std::string, LLWLParamSet*>::iterator mIt = 
+        std::map<std::string, LLWLParamSet*>::iterator mIt =
                WLFloaterManager::instance()->mWLParamList.begin();
-        for(; mIt != WLFloaterManager::instance()->mWLParamList.end(); mIt++) 
+        for(; mIt != WLFloaterManager::instance()->mWLParamList.end(); mIt++)
        {
                comboBox->add(mIt->first);
        }
        //Reorder them
        comboBox->sortByName();
 }
diff --git a/linden/indra/newview/wlretrievesettings.cpp b/linden/indra/newview/wlretrievesettings.cpp
index afa84f2..a8ed2b5 100644
--- a/linden/indra/newview/wlretrievesettings.cpp
+++ b/linden/indra/newview/wlretrievesettings.cpp
@@ -1,11 +1,11 @@
-/** 
+/**
 * @file wlfloaterwindlightsend.cpp
 * @brief WLFloaterWindLightSend class definition
 *
 * $LicenseInfo:firstyear=2007&license=viewergpl$
-* 
+*
 * Copyright (c) 2007-2009, Linden Research, Inc.
-* 
+*
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
 * online at http://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
@@ -67,8 +67,7 @@
 #include "hippolimits.h"
 #include "wlfloaterwindlightsend.h"
 #include "llviewerregion.h"
-#include "wlsettingsmanager.h"
+#include "llettherebelight.h"
-#include "lightshare.h"
 #include "linden_common.h"
 #include "llviewercontrol.h"
@@ -93,7 +92,7 @@ void retrieveWindlightSettings::result(const LLSD& content)
        for(LLSD::array_const_iterator wls = content["WindLight"].beginArray();
                wls != content["WindLight"].endArray();
                ++wls)
-        {       
+        {
                LLSD windLightLLSD = *wls;
                LLWaterParamSet* mWater;
                LLWLParamSet* mSky;
@@ -235,4 +234,4 @@ void retrieveWindlightSettings::error(U32 status, const std::string& reason)
 {
        LL_INFOS("Inventory") << "retrieveWindlightSettings::error "
                << status << ": " << reason << LL_ENDL;
-}
-\ No newline at end of file
+}
diff --git a/linden/indra/newview/wlsettingsmanager.cpp b/linden/indra/newview/wlsettingsmanager.cpp
deleted file mode 100644
index c0a07e1..0000000
--- a/linden/indra/newview/wlsettingsmanager.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-/** 
-* @file wlfloaterwindlightsend.cpp
-* @brief WLFloaterWindLightSend class definition
-*
-* $LicenseInfo:firstyear=2007&license=viewergpl$
-* 
-* Copyright (c) 2007-2009, Linden Research, Inc.
-* 
-* Second Life Viewer Source Code
-* The source code in this file ("Source Code") is provided by Linden Lab
-* to you under the terms of the GNU General Public License, version 2.0
-* ("GPL"), unless you have obtained a separate licensing agreement
-* ("Other License"), formally executed by you and Linden Lab.  Terms of
-* the GPL can be found in doc/GPL-license.txt in this distribution, or
-* online at http://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-* COMPLETENESS OR PERFORMANCE.
-* $/LicenseInfo$
-*/
-#include "llviewerprecompiledheaders.h"
-#include "llfloaterwindlight.h"
-#include "pipeline.h"
-#include "llsky.h"
-#include "llsliderctrl.h"
-#include "llmultislider.h"
-#include "llmultisliderctrl.h"
-#include "llspinctrl.h"
-#include "llcheckboxctrl.h"
-#include "lluictrlfactory.h"
-#include "llviewercamera.h"
-#include "llcombobox.h"
-#include "lllineeditor.h"
-#include "llfloaterdaycycle.h"
-#include "lltabcontainer.h"
-#include "llboost.h"
-#include "llagent.h"
-#include "llinventorymodel.h"
-#include "llviewerinventory.h"
-#include "v4math.h"
-#include "llviewerdisplay.h"
-#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-#include "llsavedsettingsglue.h"
-#include "llwlparamset.h"
-#include "llwlparammanager.h"
-#include "llwaterparammanager.h"
-#include "llpostprocess.h"
-#include "hippolimits.h"
-#include "wlfloaterwindlightsend.h"
-#include "llviewerregion.h"
-#include "wlsettingsmanager.h"
-#include "lightshare.h"
-#include "linden_common.h"
-#include "llviewercontrol.h"
-#include "message.h"
-#include "meta7windlight.h"
-#include "llworld.h"
-#undef max
-const std::string WLSettingsManager::wlWaterPresetName = "(Region settings)";
-const std::string WLSettingsManager::wlSkyPresetName   = "(Region settings)";
-LLTimer* WLSettingsManager::wlIgnoreTimer = new LLTimer();
-bool WLSettingsManager::wlIgnoreRegion = false;
-LLWaterParamSet* WLSettingsManager::mWater = NULL;
-LLWLParamSet* WLSettingsManager::mSky = NULL;
-LLUUID* WLSettingsManager::mWaterNormal = NULL;
-void WLSettingsManager::Apply( LLWLParamSet* Sky, LLWaterParamSet* Water, LLUUID* WaterNormal )
-{
-        if( gSavedSettings.getU32("LightShareAllowed") <= WindlightMessage::LIGHTSHARE_NEVER )
-                return;
-        std::string water = LLWaterParamManager::instance()->mCurParams.mName;
-        std::string sky = LLWLParamManager::instance()->mCurParams.mName;
-        // If they are using region settings already, or LightShare is
-        // always allowed, just apply the new settings, don't bother asking.
-        if( gSavedSettings.getU32("LightShareAllowed") == WindlightMessage::LIGHTSHARE_ALWAYS ||
-            (sky == wlSkyPresetName && water == wlWaterPresetName) )
-        {
-                mSky = Sky;
-                mWater = Water;
-                mWaterNormal = WaterNormal;
-                Apply();
-                return;
-        }
-        if( !wlignoreTimerHasExpired() )
-        {
-                // The user recently ignored a windlight message, so ignore
-                // this one too, and restart the timer.
-                wlrestartIgnoreTimer();
-                return;
-        }
-        if(wlIgnoreRegion)
-        {
-                // We are ignoring new settings until user enters a new region.
-                return;
-        }
-        if( gSavedSettings.getU32("LightShareAllowed") == WindlightMessage::LIGHTSHARE_ASK &&
-            mSky == NULL && mWater == NULL)
-        {
-                // No most recent, so store this and create notification
-                // asking the user whether to apply or not.
-                mSky = Sky;
-                mWater = Water;
-                mWaterNormal = WaterNormal;
-                LLNotifications::instance().add("ConfirmLightShare", LLSD(), LLSD(), 
-                                                boost::bind(&wlapplyCallback, _1, _2));
-        }
-        else
-        {
-                // No new notification (to avoid spamming the user, we do keep the saves from above)
-                mSky = Sky;
-                mWater = Water;
-                mWaterNormal = WaterNormal;
-        }
-}
-// static
-bool WLSettingsManager::wlapplyCallback(const LLSD& notification,
-                                     const LLSD& response)
-{
-        S32 option = LLNotification::getSelectedOption(notification, response);
-        switch(option)
-        {
-                case 0:{
-                        // "Apply"
-                        Apply();
-                        break;
-                }
-                case 1:{
-                        // "Not Now", ignore until the region stops spamming
-                        wlrestartIgnoreTimer();
-                        break;
-                }
-                case 2:{
-                        // "Ignore", ignore all until user leaves the region
-                        wlIgnoreRegion = true;
-                        break;
-                }
-        }
-        return false;
-}
-//static
-void WLSettingsManager::Apply()
-{
-        LLWaterParamManager* water_mgr = LLWaterParamManager::instance();
-        LLWLParamManager* sky_mgr = LLWLParamManager::instance();
-        F32 fade = 0; //Instant
-        bool error;
-        fade = mSky->getFloat("fade", error);
-        mWater->mName = wlWaterPresetName;
-        if(fade != 0 && water_mgr->mCurParams.mName == wlWaterPresetName)//Load the settings forcefully the first time
-        {
-                LLWaterParamSet oldWset = water_mgr->mCurParams;
-                //This still needs done so that we update right, but load it to the old
-                water_mgr->removeParamSet( wlWaterPresetName, false );
-                water_mgr->addParamSet( wlWaterPresetName, oldWset );
-                water_mgr->savePreset( wlWaterPresetName );
-                water_mgr->loadPreset( wlWaterPresetName, true );
-                water_mgr->setNormalMapID( *mWaterNormal );
-                //Then mix with the new
-                water_mgr->SetMixTime(mWater, fade);
-        }
-        else
-        {
-                //Instant if fade is 0
-                water_mgr->removeParamSet( wlWaterPresetName, false );
-                water_mgr->addParamSet( wlWaterPresetName, *mWater );
-                water_mgr->savePreset( wlWaterPresetName );
-                water_mgr->loadPreset( wlWaterPresetName, true );
-                water_mgr->setNormalMapID( *mWaterNormal );
-        }
-        mSky->mName = wlSkyPresetName;
-        if(fade != 0 && sky_mgr->mCurParams.mName == wlSkyPresetName)//Load the settings forcefully the first time
-        {
-                LLWLParamSet oldset = sky_mgr->mCurParams;
-                //This still needs done so that we update right, but load it to the old
-                sky_mgr->removeParamSet( wlSkyPresetName, true );
-                sky_mgr->addParamSet( wlSkyPresetName, oldset );
-                sky_mgr->savePreset( wlSkyPresetName );
-                sky_mgr->loadPreset( wlSkyPresetName, true );
-                //Then mix with the new
-                sky_mgr->SetMixTime(mSky, fade);
-        }
-        else
-        {
-                //Instant if fade is 0
-                sky_mgr->mAnimator.mIsRunning = false;
-                sky_mgr->mAnimator.mUseLindenTime = false;
-                sky_mgr->removeParamSet( wlSkyPresetName, false );
-                sky_mgr->addParamSet( wlSkyPresetName, *mSky );
-                sky_mgr->savePreset( wlSkyPresetName );
-                sky_mgr->loadPreset( wlSkyPresetName, true );
-        }
-        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
-        mSky = NULL;
-        mWater = NULL;
-        mWaterNormal = NULL;
-}
-// static
-void WLSettingsManager::wlresetRegion()
-{
-        wlIgnoreRegion = false;
-        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
-}
-// static
-void WLSettingsManager::wlrestartIgnoreTimer()
-{
-        F32 time = gSavedSettings.getF32("LightShareIgnoreTimer");
-        wlIgnoreTimer->start();
-        wlIgnoreTimer->setTimerExpirySec( (time < 0) ? 0 : time );
-}
-// static
-bool WLSettingsManager::wlignoreTimerHasExpired()
-{
-        return wlIgnoreTimer->hasExpired();
-}
-\ No newline at end of file
diff --git a/linden/indra/newview/wlsettingsmanager.h b/linden/indra/newview/wlsettingsmanager.h
deleted file mode 100644
index 5a0e9e7..0000000
--- a/linden/indra/newview/wlsettingsmanager.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/** 
- * @file wlfloaterwindlightsend.h
- * @brief WLFloaterWindLightSend class definition
- *
- * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
- * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-/*
- * Menu for adjusting the atmospheric settings of the world
- */
-#ifndef WINDLIGHTSETTINGSMANAGER_H
-#define WINDLIGHTSETTINGSMANAGER_H
-#include <string>
-#include "llwlparamset.h"
-#include "llwaterparamset.h"
-#include "lluuid.h"
-class LLSD;
-class LLTimer;
-class LLUUID;
-class LLWaterParamSet;
-class LLWLParamSet;
-/// Menuing system for all of windlight's functionality
-class WLSettingsManager
-{
-public:
-        static LLTimer* wlIgnoreTimer;
-        static bool wlIgnoreRegion;
-        // Called after the user has entered a new region, to reset the
-        // "ignore while in this region" state.
-        static void wlresetRegion();
-        static void Apply( LLWLParamSet* Sky, LLWaterParamSet* Water, LLUUID* WaterNormal );
-        // Callback when the user interacts with the notification.
-        static bool wlapplyCallback(const LLSD& notification,
-                                  const LLSD& response);
-        static LLWaterParamSet* mWater;
-        static LLWLParamSet* mSky;
-        static LLUUID* mWaterNormal;
-private:
-        static void Apply();
-        // The name of the water preset where the region settings are stored.
-        static const std::string wlWaterPresetName;
-        // The name of the sky preset where the region settings are stored.
-        static const std::string wlSkyPresetName;
-        // Restart the timer for temporarily ignoring settings.
-        static void wlrestartIgnoreTimer();
-        // Returns true if the ignore timer has expired (i.e. new settings
-        // should not be ignored anymore).
-        static bool wlignoreTimerHasExpired();
-};
-#endif
-\ No newline at end of file