1 files changed, 62 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 37cd4ef..9936f3b 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -60,6 +60,7 @@
 
 #undef max
 
+
 LLFloaterWindLight* LLFloaterWindLight::sWindLight = NULL;
 
 std::set<std::string> LLFloaterWindLight::sDefaultPresets;
@@ -227,6 +228,10 @@ void LLFloaterWindLight::initCallbacks(void) {
         // Dome
         childSetCommitCallback("WLGamma", onFloatControlMoved, &param_mgr->mWLGamma);
         childSetCommitCallback("WLStarAlpha", onStarAlphaMoved, NULL);
+
+        // next/prev buttons
+        childSetAction("next", onClickNext, this);
+        childSetAction("prev", onClickPrev, this);
 }
 
 void LLFloaterWindLight::onClickHelp(void* data)
@@ -317,6 +322,15 @@ void LLFloaterWindLight::syncMenu()
         LLWLParamSet& currentParams = param_mgr->mCurParams;
         //std::map<std::string, LLVector4> & currentParams = param_mgr->mCurParams.mParamValues;
 
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        // Fixes LL "bug" (preset name isn't kept synchronized)
+        LLComboBox* comboBox = getChild<LLComboBox>("WLPresetsCombo");
+        if (comboBox->getSelectedItemLabel() != currentParams.mName)
+        {
+                comboBox->setSimple(currentParams.mName);
+        }
+// [/RLVa:KB]
+
         // blue horizon
         param_mgr->mBlueHorizon = currentParams.getVector(param_mgr->mBlueHorizon.mName, err);
         childSetValue("WLBlueHorizonR", param_mgr->mBlueHorizon.r / 2.0);
@@ -992,3 +1006,51 @@ void LLFloaterWindLight::deactivateAnimator()
         LLWLParamManager::instance()->mAnimator.mIsRunning = false;
         LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
 }
+
+void LLFloaterWindLight::onClickNext(void* user_data)
+{
+        LLWLParamManager * param_mgr = LLWLParamManager::instance();
+        LLWLParamSet& currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWLParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the end, loop
+        std::map<std::string, LLWLParamSet>::iterator last = param_mgr->mParamList.end(); --last;
+        if(mIt == last) 
+        {
+                mIt = param_mgr->mParamList.begin();
+        }
+        else
+        {
+                mIt++;
+        }
+        param_mgr->mAnimator.mIsRunning = false;
+        param_mgr->mAnimator.mUseLindenTime = false;
+        param_mgr->loadPreset(mIt->first, true);
+}
+
+void LLFloaterWindLight::onClickPrev(void* user_data)
+{
+        LLWLParamManager * param_mgr = LLWLParamManager::instance();
+        LLWLParamSet& currentParams = param_mgr->mCurParams;
+
+        // find place of current param
+        std::map<std::string, LLWLParamSet>::iterator mIt = 
+                param_mgr->mParamList.find(currentParams.mName);
+
+        // if at the beginning, loop
+        if(mIt == param_mgr->mParamList.begin()) 
+        {
+                std::map<std::string, LLWLParamSet>::iterator last = param_mgr->mParamList.end(); --last;
+                mIt = last;
+        }
+        else
+        {
+                mIt--;
+        }
+        param_mgr->mAnimator.mIsRunning = false;
+        param_mgr->mAnimator.mUseLindenTime = false;
+        param_mgr->loadPreset(mIt->first, true);
+}