1 files changed, 3 insertions, 114 deletions

diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 75592da..b4d999c 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -34,6 +34,7 @@
 
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
+#include "lightshare.h"
 
 #include "pipeline.h"
 #include "llsky.h"
@@ -77,9 +78,6 @@
 
 #include "curl/curl.h"
 
-const std::string LLWLParamManager::sWaterPresetName = "(Region settings)";
-const std::string LLWLParamManager::sSkyPresetName   = "(Region settings)";
-
 LLWLParamManager * LLWLParamManager::sInstance = NULL;
 std::vector<LLWLPresetsObserver*> LLWLParamManager::sObservers;
 LLFrameTimer wlSmoothTransitionTimer;
@@ -346,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;
         }
@@ -388,7 +386,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
         if(propagate)
         {
                 getParamSet(name, mCurParams);
-                propagateParameters();
+                LightShare::apply(NULL, NULL, &mCurParams, WL_SCOPE_USER);
         }
 
         notifyObservers();
@@ -859,112 +857,3 @@ bool LLWLParamManager::isSettingsNotecard(std::string name)
 {
         return (isSkySettingsNotecard(name) || isWaterSettingsNotecard(name));
 }
-
-
-struct WLCombined userSet, regionSet, parcelSet, RLVSet;
-
-//static
-void LLWLParamManager::apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky)
-// TODO - Pass in scope and day cycle stuff.
-{
-        LLWaterParamManager* waterMgr = LLWaterParamManager::instance();
-        LLWLParamManager* skyMgr = LLWLParamManager::instance();
-        struct WLCombined* thisSet = &userSet;
-
-//      if (region == scope)
-                thisSet = &regionSet;
-//      if (parcel== scope)
-//              thisSet = &parcelSet;
-//      if (RLV == scope)
-//              thisSet = &RLVSet;
-
-        thisSet->water.setAll(newWater->getAll());
-        thisSet->water.mParamValues["normalMap"] = *newWaterNormal;
-        thisSet->sky.setAll(newSky->getAll());
-
-// TODO - if scope is region or parcel, and not using server settings
-//          return
-
-        thisSet->enabled = true;
-
-        F32 fade = 0; //Instant
-        bool error;
-        fade = newSky->getFloat("fade", error);
-
-        newWater->mName = sWaterPresetName;
-        newSky->mName = sSkyPresetName;
-        LLWaterParamSet oldWaterSet = waterMgr->mCurParams;
-        LLWLParamSet oldWLSet = skyMgr->mCurParams;
-
-        if (fade)
-        {
-                // TODO - should copy the original, then set that here.
-                // The fade should delete this copy once it's done fading.
-                waterMgr->removeParamSet( sWaterPresetName, false );
-                waterMgr->addParamSet( sWaterPresetName, oldWaterSet );
-                waterMgr->loadPreset( sWaterPresetName, true );
-                waterMgr->setNormalMapID( *newWaterNormal );
-
-                skyMgr->removeParamSet( sSkyPresetName, true );
-                skyMgr->addParamSet( sSkyPresetName, oldWLSet );
-                skyMgr->loadPreset( sSkyPresetName, true );
-         }
-
-        for(LLSD::map_const_iterator i = thisSet->water.mParamValues.beginMap();
-                i != thisSet->water.mParamValues.endMap();
-                ++i)
-        {
-                const std::string& param = i->first;
-
-                if(i->second.isArray())
-                {
-                        for (int j = 0; j < i->second.size(); j++)
-                        {
-                                oldWaterSet.mParamValues[param][j] = i->second[j].asReal();
-                        }
-                }
-                else if(i->second.isReal())
-                  oldWaterSet.mParamValues[param] = i->second.asReal();
-        }
-
-        skyMgr->mAnimator.mIsRunning = false;
-        skyMgr->mAnimator.mUseLindenTime = false;
-        for(LLSD::map_const_iterator i = thisSet->sky.mParamValues.beginMap();
-                i != thisSet->sky.mParamValues.endMap();
-                ++i)
-        {
-                const std::string& param = i->first;
-
-                if(i->second.isArray())
-                {
-                        for (int j = 0; j < i->second.size(); j++)
-                        {
-                                oldWLSet.mParamValues[param][j] = i->second[j].asReal();
-                        }
-                }
-                else if(i->second.isReal())
-                  oldWLSet.mParamValues[param] = i->second.asReal();
-        }
-
-// TODO - If RLV enabled
-//          Loop through RLVSet, setting the values into the old one, but keeping old values that are not in RLVSet
-
-        if (fade)
-        {
-                waterMgr->SetMixTime(&oldWaterSet, fade);
-                skyMgr->SetMixTime(&oldWLSet, fade);
-        }
-        else
-        {
-                waterMgr->removeParamSet( sWaterPresetName, false );
-                waterMgr->addParamSet( sWaterPresetName, oldWaterSet );
-                waterMgr->loadPreset( sWaterPresetName, true );
-                waterMgr->setNormalMapID( *newWaterNormal );
-
-                skyMgr->removeParamSet( sSkyPresetName, true );
-                skyMgr->addParamSet( sSkyPresetName, oldWLSet );
-                skyMgr->loadPreset( sSkyPresetName, true );
-        }
-
-        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
-}