From f332eaa4a69a4546e0b9b2ba3719e3c038731fd3 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Thu, 10 Sep 2009 21:43:11 -0700 Subject: Created new toolbar control for windlight presets and options --- linden/indra/newview/llwlparammanager.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'linden/indra/newview/llwlparammanager.h') diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h index 1d9291c..9895e91 100644 --- a/linden/indra/newview/llwlparammanager.h +++ b/linden/indra/newview/llwlparammanager.h @@ -40,6 +40,13 @@ #include "llviewercamera.h" class LLGLSLShader; + +class LLWLPresetsObserver +{ +public: + virtual ~LLWLPresetsObserver() { }; + virtual void changed() = 0; +}; // color control struct WLColorControl { @@ -195,6 +202,11 @@ public: // singleton pattern implementation static LLWLParamManager * instance(); + // manage observers + static void addObserver(LLWLPresetsObserver* observer); + static void removeObserver(LLWLPresetsObserver* observer); + static void notifyObservers(); + public: // helper variables @@ -255,6 +267,8 @@ public: private: // our parameter manager singleton instance static LLWLParamManager * sInstance; + + static std::vector sObservers; }; -- cgit v1.1 From f695f6c25c13652fa2253c36c92bd28ae6415fd8 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 13 Sep 2009 05:48:24 -0700 Subject: Fixed windlight toolbar not updating windlight floater pulldown --- linden/indra/newview/llwlparammanager.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'linden/indra/newview/llwlparammanager.h') diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h index 9895e91..4507307 100644 --- a/linden/indra/newview/llwlparammanager.h +++ b/linden/indra/newview/llwlparammanager.h @@ -262,6 +262,9 @@ public: // list of all the parameters, listed by name std::map mParamList; + + // current parameter name + std::string mCurPresetName; private: -- cgit v1.1 From 162ac8865cb927c561283da696570dcd68490c67 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 13 Sep 2009 20:26:02 -0700 Subject: Added prev/next buttons for windlight presets, cleaned up some stuff --- linden/indra/newview/llwlparammanager.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'linden/indra/newview/llwlparammanager.h') diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h index 4507307..355d3e3 100644 --- a/linden/indra/newview/llwlparammanager.h +++ b/linden/indra/newview/llwlparammanager.h @@ -261,11 +261,7 @@ public: F32 mDomeRadius; // list of all the parameters, listed by name - std::map mParamList; - - // current parameter name - std::string mCurPresetName; - + std::map mParamList; private: // our parameter manager singleton instance -- cgit v1.1