From 79fb8e2ec26dc2c5a42ef1ee48ebaaa39183c67b Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Thu, 31 Mar 2011 18:24:01 +0300 Subject: 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. --- indra/newview/llfloaterwater.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'indra/newview/llfloaterwater.cpp') 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 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("env_water"); + llassert(water); if(scope != sScope && ((LLView*)water)->getVisible()) { -- cgit v1.3