Merge remote branch 'mccabe/1.2.0-next' into next

Conflicts:
	linden/indra/newview/llfloaterchat.cpp
	linden/indra/newview/llfloatermap.cpp
	linden/indra/newview/llinventorybridge.cpp
	linden/indra/newview/llnetmap.cpp
	linden/indra/newview/llviewermessage.cpp
	linden/indra/newview/llviewerobjectlist.cpp

1 files changed, 15 insertions, 2 deletions

diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 1d9291c..355d3e3 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
@@ -249,12 +261,13 @@ public:
         F32 mDomeRadius;
         
         // list of all the parameters, listed by name
-        std::map<std::string, LLWLParamSet> mParamList;
-        
+        std::map<std::string, LLWLParamSet> mParamList; 
         
 private:
         // our parameter manager singleton instance
         static LLWLParamManager * sInstance;
+        
+        static std::vector<LLWLPresetsObserver*> sObservers;
 
 };