[NOTE: This was an erroneous commit, and was reverted in the next revision]

QAR-369 - viewer-cleanup2-7 81916 merged into release.

1 files changed, 10 insertions, 12 deletions

diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index c8556c7edc..24a5eb4f89 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -65,7 +65,6 @@ const BOOL	NOT_MOUSE_OPAQUE = FALSE;
 
 const U32 GL_NAME_UI_RESERVED = 2;
 
-
 /*
 // virtual functions defined in LLView:
 
@@ -150,7 +149,7 @@ virtual BOOL	handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
 		*
 */
 
-class LLView : public LLMouseHandler, public LLMortician, public LLSimpleListenerObservable
+class LLView : public LLMouseHandler, public LLMortician
 {
 
 public:
@@ -294,7 +293,6 @@ public:
 	
 	LLHandle<LLView>	getHandle()				{ mHandle.bind(this); return mHandle; }
 
-
 	U32			getFollows() const				{ return mReshapeFlags; }
 	BOOL		followsLeft() const				{ return mReshapeFlags & FOLLOWS_LEFT; }
 	BOOL		followsRight() const			{ return mReshapeFlags & FOLLOWS_RIGHT; }
@@ -393,13 +391,13 @@ public:
 	void addListenerToControl(LLEventDispatcher *observer, const LLString& name, LLSD filter, LLSD userdata);
 
 	void addBoolControl(LLString name, bool initial_value);
-	LLControlBase *getControl(LLString name);
-	LLControlBase *findControl(LLString name);
+	LLControlVariable *getControl(LLString name);
+	LLControlVariable *findControl(LLString name);
 
-	void			setControlValue(const LLSD& value);
+	bool setControlValue(const LLSD& value);
 	virtual void	setControlName(const LLString& control, LLView *context);
 	virtual LLString getControlName() const { return mControlName; }
-	virtual bool	handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
+//	virtual bool	handleEvent(LLPointer<LLEvent> event, const LLSD& userdata);
 	virtual void	setValue(const LLSD& value);
 	virtual LLSD	getValue() const;
 
@@ -494,11 +492,12 @@ protected:
 	LLView* childrenHandleRightMouseDown(S32 x, S32 y, MASK mask);
 	LLView* childrenHandleRightMouseUp(S32 x, S32 y, MASK mask);
 
-	typedef std::map<LLString, LLControlBase*> control_map_t;
+	static bool controlListener(const LLSD& newvalue, LLHandle<LLView> handle, std::string type);
+
+	typedef std::map<LLString, LLControlVariable*> control_map_t;
 	control_map_t mFloaterControls;
 
 	virtual LLView* getChildByName(const LLString& name, BOOL recurse = FALSE) const;
-
 private:
 	LLView*		mParentView;
 	child_list_t mChildList;
@@ -537,9 +536,8 @@ private:
 	dispatch_list_t mDispatchList;
 
 	LLString		mControlName;
-
-
-// Just debugging stuff? We should try to hide anything that's not. -MG
+	boost::signals::connection mControlConnection;
+	
 public:
 	static BOOL	sDebugRects;	// Draw debug rects behind everything.
 	static BOOL sDebugKeys;