diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-03-31 18:24:01 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-03-31 18:24:01 +0300 |
| commit | 79fb8e2ec26dc2c5a42ef1ee48ebaaa39183c67b (patch) | |
| tree | 2747ceb9c211f677be9a595ba91b75e71506c529 /indra/newview/llfloaterwater.cpp | |
| parent | 5476999e9dfeca48009b43e4fcc0967be5540572 (diff) | |
STORM-1126 WIP Windlight Estate Settings integration: pass 4
Changes:
* Fixed incorrect way to pass parameters to notifications.
* Fixed crashes in the Advanced Sky floater and the Region Terrain panel.
* Fixed initialization and multiple instantiation of the Day Cycle floater
(that might lead to incorrect behavior).
* Fixed and re-enabled committing env. settings changes to region.
* Fixed day cycle and sky settings being sent as empty arrays and therefore not passing validation on server.
It is now possible to change region environment settings.
* Added debug messages.
Diffstat (limited to 'indra/newview/llfloaterwater.cpp')
| -rw-r--r-- | indra/newview/llfloaterwater.cpp | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/indra/newview/llfloaterwater.cpp b/indra/newview/llfloaterwater.cpp index 85bb20a1db..533831f181 100644 --- a/indra/newview/llfloaterwater.cpp +++ b/indra/newview/llfloaterwater.cpp @@ -59,8 +59,6 @@ #undef max -LLFloaterWater* LLFloaterWater::sWater = NULL; - std::set<std::string> LLFloaterWater::sDefaultPresets; LLEnvKey::EScope LLFloaterWater::sScope; std::string LLFloaterWater::sOriginalTitle; @@ -108,19 +106,11 @@ BOOL LLFloaterWater::postBuild() return TRUE; } -//static -LLFloaterWater* LLFloaterWater::instance() -{ - if (!sWater) - { - sWater = new LLFloaterWater(LLSD()); - } - return sWater; -} - +// static void LLFloaterWater::show(LLEnvKey::EScope scope) { - LLFloaterWater* water = instance(); + LLFloaterWater* water = LLFloaterReg::getTypedInstance<LLFloaterWater>("env_water"); + llassert(water); if(scope != sScope && ((LLView*)water)->getVisible()) { |