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/llfloaterenvsettings.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'indra/newview/llfloaterenvsettings.cpp') diff --git a/indra/newview/llfloaterenvsettings.cpp b/indra/newview/llfloaterenvsettings.cpp index e863aef94f..733b808ec9 100644 --- a/indra/newview/llfloaterenvsettings.cpp +++ b/indra/newview/llfloaterenvsettings.cpp @@ -63,6 +63,7 @@ LLFloaterEnvSettings::LLFloaterEnvSettings(const LLSD &key) : LLFloater(key) { + lldebugs << "Creating env settings floater" << llendl; } LLFloaterEnvSettings::~LLFloaterEnvSettings() @@ -75,6 +76,10 @@ BOOL LLFloaterEnvSettings::postBuild() // load it up initCallbacks(); syncMenu(); + + LLEnvKey::EScope cur_scope = LLEnvManager::getInstance()->getNormallyDisplayedScope(); + childSetValue("RegionWLOptIn", cur_scope == LLEnvKey::SCOPE_REGION); + return TRUE; } @@ -258,11 +263,13 @@ void LLFloaterEnvSettings::onChangeWaterColor(LLUICtrl* ctrl, void* userData) void LLFloaterEnvSettings::onOpenAdvancedSky(void* userData1, void* userData2) { + // *TODO: make sure title is displayed correctly. LLFloaterReg::showInstance("env_windlight"); } void LLFloaterEnvSettings::onOpenAdvancedWater(void* userData1, void* userData2) { + // *TODO: make sure title is displayed correctly. LLFloaterReg::showInstance("env_water"); } -- cgit v1.2.3