summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-07-01 16:31:02 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2011-07-01 16:31:02 +0300
commit62e7b3d3c71cbd777633525595b87991d797ef65 (patch)
tree634ab8b88e0a12fd6b5a6f4f439bcb4c7d830387 /indra/newview
parent08ef4819d64bca0ac55cd9d4b77602e3e219d3a2 (diff)
STORM-1470 FIXED Sky setting / Lighting preset position controls were inconsistent.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloatereditsky.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloatereditsky.cpp b/indra/newview/llfloatereditsky.cpp
index 0163dfbf30..abee7b5dc9 100644
--- a/indra/newview/llfloatereditsky.cpp
+++ b/indra/newview/llfloatereditsky.cpp
@@ -249,8 +249,9 @@ void LLFloaterEditSky::syncControls()
param_mgr->mAmbient = cur_params.getVector(param_mgr->mAmbient.mName, err);
setColorSwatch("WLAmbient", param_mgr->mAmbient, WL_SUN_AMBIENT_SLIDER_SCALE);
- F32 sun_pos = param_mgr->mCurParams.getFloat("sun_angle",err) / F_TWO_PI;
- getChild<LLMultiSliderCtrl>("WLSunPos")->setCurSliderValue(sun_pos_to_time24(sun_pos), TRUE);
+ F32 time24 = sun_pos_to_time24(param_mgr->mCurParams.getFloat("sun_angle",err) / F_TWO_PI);
+ getChild<LLMultiSliderCtrl>("WLSunPos")->setCurSliderValue(time24, TRUE);
+ getChild<LLTimeCtrl>("WLDayTime")->setTime24(time24);
childSetValue("WLEastAngle", param_mgr->mCurParams.getFloat("east_angle",err) / F_TWO_PI);
// Clouds