diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-09 16:29:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-09 16:29:30 -0400 |
| commit | 6ee87ae28144531caf387c8f68f8c78aae552c2c (patch) | |
| tree | a7eb32a57dd15f9f95404972b0d311b62858a60e /indra/newview/llfloaterregioninfo.cpp | |
| parent | f8f9e089e1ae8e439bc8c4373a183fe5210b2cea (diff) | |
| parent | f593911580383af653dd106ade60084a0eb64ebb (diff) | |
merge up changes for water preset editing
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 567183b955..cb84eaed34 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -3302,6 +3302,7 @@ BOOL LLPanelEnvironmentInfo::postBuild() LLDayCycleManager::instance().setModifyCallback(boost::bind(&LLPanelEnvironmentInfo::populateDayCyclesList, this)); LLWLParamManager::instance().setPresetListChangeCallback(boost::bind(&LLPanelEnvironmentInfo::populateSkyPresetsList, this)); + LLWaterParamManager::instance().setPresetListChangeCallback(boost::bind(&LLPanelEnvironmentInfo::populateWaterPresetsList, this)); return TRUE; } |