From e045d212d35354d679c2d2e05c6d4689f9f8ac95 Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Mon, 27 Sep 2010 22:56:08 -0400 Subject: STORM-1126 WIP Windlight Estate Settings port from 1.23: first pass at merging in windlight estate settings to viewer-dev codebase. not built, not tested. Probably needs a bunch of fixes to be able to be integrated. (resubmitted by Vadim ProductEngine) --- indra/newview/llfloaterwater.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llfloaterwater.h') diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h index e3db91e80d..57fb9745b1 100644 --- a/indra/newview/llfloaterwater.h +++ b/indra/newview/llfloaterwater.h @@ -101,6 +101,8 @@ public: private: static std::set sDefaultPresets; + static LLEnvKey::EScope sScope; + static std::string sOriginalTitle; }; -- cgit v1.2.3 From 2fb337bc12984f9abecfbc7f3918c372a7b5ac6c Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Thu, 30 Sep 2010 23:21:23 -0400 Subject: STORM-1126 WIP Windlight Estate Settings port from 1.23: second pass at getting windlight ported to V2. Lots of cleanup in the floater classes. Not sure every decision was correct but it compiles now. Doesn't link yet. (resubmitted by Vadim ProductEngine) --- indra/newview/llfloaterwater.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/llfloaterwater.h') diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h index 57fb9745b1..8b3915bfe9 100644 --- a/indra/newview/llfloaterwater.h +++ b/indra/newview/llfloaterwater.h @@ -35,6 +35,7 @@ #include #include "llwlparamset.h" +#include "llenvmanager.h" struct WaterVector2Control; struct WaterVector3Control; @@ -53,6 +54,11 @@ public: /// initialize all void initCallbacks(void); + // one instance only + static LLFloaterWater* instance(); + + void show(LLEnvKey::EScope scope); + bool newPromptCallback(const LLSD& notification, const LLSD& response); /// general purpose callbacks for dealing with color controllers @@ -103,6 +109,8 @@ private: static std::set sDefaultPresets; static LLEnvKey::EScope sScope; static std::string sOriginalTitle; + + static LLFloaterWater* sWater; }; -- cgit v1.2.3 From 6bb02e0e260df2d00ab53376cf15af5e7e2fd12f Mon Sep 17 00:00:00 2001 From: Celierra Darling Date: Mon, 10 Jan 2011 15:06:30 -0500 Subject: STORM-1126 WIP Windlight Estate Settings port from 1.23: Various changes to allow compilation (resubmitted by Vadim ProductEngine) --- indra/newview/llfloaterwater.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfloaterwater.h') diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h index 8b3915bfe9..3bdec389f3 100644 --- a/indra/newview/llfloaterwater.h +++ b/indra/newview/llfloaterwater.h @@ -107,8 +107,8 @@ public: private: static std::set sDefaultPresets; - static LLEnvKey::EScope sScope; - static std::string sOriginalTitle; + static LLEnvKey::EScope sScope; + static std::string sOriginalTitle; static LLFloaterWater* sWater; }; -- cgit v1.2.3 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.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'indra/newview/llfloaterwater.h') diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h index 3bdec389f3..57e44f7930 100644 --- a/indra/newview/llfloaterwater.h +++ b/indra/newview/llfloaterwater.h @@ -33,8 +33,10 @@ #include "llfloater.h" +#if 0 #include #include "llwlparamset.h" +#endif #include "llenvmanager.h" struct WaterVector2Control; @@ -54,10 +56,7 @@ public: /// initialize all void initCallbacks(void); - // one instance only - static LLFloaterWater* instance(); - - void show(LLEnvKey::EScope scope); + static void show(LLEnvKey::EScope scope = LLEnvKey::SCOPE_LOCAL); bool newPromptCallback(const LLSD& notification, const LLSD& response); @@ -109,8 +108,6 @@ private: static std::set sDefaultPresets; static LLEnvKey::EScope sScope; static std::string sOriginalTitle; - - static LLFloaterWater* sWater; }; -- cgit v1.2.3 From b75528fde663413e9c2a4be2975e014771fb562f 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 9 Removed dead code. --- indra/newview/llfloaterwater.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/newview/llfloaterwater.h') diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h index 57e44f7930..25858fba01 100644 --- a/indra/newview/llfloaterwater.h +++ b/indra/newview/llfloaterwater.h @@ -33,10 +33,6 @@ #include "llfloater.h" -#if 0 -#include -#include "llwlparamset.h" -#endif #include "llenvmanager.h" struct WaterVector2Control; -- cgit v1.2.3