aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterwindlight.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-14 17:52:41 -0700
committerMcCabe Maxsted2009-09-14 17:52:41 -0700
commit7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd (patch)
tree0243666021de3ae6ac61a6c6f4e57d42771fe964 /linden/indra/newview/llfloaterwindlight.cpp
parentApplied BlockClickSit debug setting from Emerald to block sit click action (diff)
downloadmeta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.zip
meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.gz
meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.bz2
meta-impy-7f090f7bec5264ca9e203c27dfb6b2992bb2bcbd.tar.xz
Merged in jacek/next
Diffstat (limited to 'linden/indra/newview/llfloaterwindlight.cpp')
-rw-r--r--linden/indra/newview/llfloaterwindlight.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 914513b..9936f3b 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -322,12 +322,14 @@ void LLFloaterWindLight::syncMenu()
322 LLWLParamSet& currentParams = param_mgr->mCurParams; 322 LLWLParamSet& currentParams = param_mgr->mCurParams;
323 //std::map<std::string, LLVector4> & currentParams = param_mgr->mCurParams.mParamValues; 323 //std::map<std::string, LLVector4> & currentParams = param_mgr->mCurParams.mParamValues;
324 324
325// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
325 // Fixes LL "bug" (preset name isn't kept synchronized) 326 // Fixes LL "bug" (preset name isn't kept synchronized)
326 LLComboBox* comboBox = getChild<LLComboBox>("WLPresetsCombo"); 327 LLComboBox* comboBox = getChild<LLComboBox>("WLPresetsCombo");
327 if (comboBox->getSelectedItemLabel() != currentParams.mName) 328 if (comboBox->getSelectedItemLabel() != currentParams.mName)
328 { 329 {
329 comboBox->setSimple(currentParams.mName); 330 comboBox->setSimple(currentParams.mName);
330 } 331 }
332// [/RLVa:KB]
331 333
332 // blue horizon 334 // blue horizon
333 param_mgr->mBlueHorizon = currentParams.getVector(param_mgr->mBlueHorizon.mName, err); 335 param_mgr->mBlueHorizon = currentParams.getVector(param_mgr->mBlueHorizon.mName, err);