diff options
author | Merov Linden <merov@lindenlab.com> | 2014-02-10 21:07:21 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-02-10 21:07:21 -0800 |
commit | 2e948a8dc678d3bb5f1d4f34a04efac79b952187 (patch) | |
tree | 601637c76d2118a803ee79f91339453e1bc5f676 /indra/newview/llfloatereditdaycycle.cpp | |
parent | bd800bc2efbba57b66c4a776ac399b3680d184b5 (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloatereditdaycycle.cpp')
-rwxr-xr-x | indra/newview/llfloatereditdaycycle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatereditdaycycle.cpp b/indra/newview/llfloatereditdaycycle.cpp index b63677b258..78e20e3bf0 100755 --- a/indra/newview/llfloatereditdaycycle.cpp +++ b/indra/newview/llfloatereditdaycycle.cpp @@ -145,7 +145,7 @@ void LLFloaterEditDayCycle::initCallbacks(void) // Connect to env manager events. LLEnvManagerNew& env_mgr = LLEnvManagerNew::instance(); env_mgr.setRegionSettingsChangeCallback(boost::bind(&LLFloaterEditDayCycle::onRegionSettingsChange, this)); - env_mgr.setRegionChangeCallback(boost::bind(&LLFloaterEditDayCycle::onRegionChange, this)); + gAgent.addRegionChangedCallback(boost::bind(&LLFloaterEditDayCycle::onRegionChange, this)); env_mgr.setRegionSettingsAppliedCallback(boost::bind(&LLFloaterEditDayCycle::onRegionSettingsApplied, this, _1)); // Connect to day cycle manager events. |