diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-01-07 13:44:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-01-07 13:44:22 -0500 |
| commit | a25bcb8523db08877c47fdbd834589ebbe45ff82 (patch) | |
| tree | d0b6eb160a82aff8564522d88f4ead80704533c9 /indra/newview/llfloatereditdaycycle.cpp | |
| parent | 94ac0ffdc30842834bb8b0b6e229b21c7707c026 (diff) | |
| parent | 24c5ac7417f8b32c39dd5defec21845bd03786c4 (diff) | |
merge changes for storm-1980
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. |