Added prev/next buttons for windlight presets, cleaned up some stuff

1 files changed, 9 insertions, 7 deletions

diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index ca411c5..591b413 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -92,11 +92,11 @@ void LLWindlightRemoteCtrl::build()
 {
         if (gSavedSettings.getBOOL("ShowWindlightSettingsPopup"))
         {
-                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_windlight_remote_expanded.xml"/*, &getFactoryMap()*/);
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_windlight_remote_expanded.xml");
         }
         else
         {
-                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_windlight_remote.xml"/*, &getFactoryMap()*/);
+                LLUICtrlFactory::getInstance()->buildPanel(this, "panel_windlight_remote.xml");
         }
 }
 
@@ -128,14 +128,15 @@ void LLWindlightRemoteCtrl::refreshPresets()
         if (mPresetsCombo)
         {
                 // snag current preset
-                std::string cur_preset = LLWLParamManager::instance()->mCurPresetName;//mPresetsCombo->getValue().asString();
+                LLWLParamManager * param_mgr = LLWLParamManager::instance();
+                LLWLParamSet& currentParams = param_mgr->mCurParams;
                 
                 // clear in case presets names have changed
                 mPresetsCombo->clearRows();
 
                 std::map<std::string, LLWLParamSet>::iterator mIt = 
-                        LLWLParamManager::instance()->mParamList.begin();
-                for(; mIt != LLWLParamManager::instance()->mParamList.end(); mIt++) 
+                        param_mgr->mParamList.begin();
+                for(; mIt != param_mgr->mParamList.end(); mIt++) 
                 {
                         mPresetsCombo->add(mIt->first);
                 }
@@ -148,9 +149,10 @@ void LLWindlightRemoteCtrl::refreshPresets()
                 mPresetsCombo->addSimpleElement(getString("midnight"), ADD_BOTTOM);
                 mPresetsCombo->addSimpleElement(getString("revert_region"), ADD_BOTTOM);
 
-                if (!cur_preset.empty())
+                if (mPresetsCombo->getSelectedItemLabel() != currentParams.mName &&
+                        !currentParams.mName.empty())
                 {
-                        mPresetsCombo->selectByValue(LLSD(cur_preset));
+                        mPresetsCombo->selectByValue(LLSD(currentParams.mName));
                 }
                 else
                 {