From d1582a5105f01181535fb859c530e45c2efca071 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Mon, 5 Feb 2007 20:20:42 +0000
Subject: merge -r 57111:57464 maintenance.

---
 indra/llxml/llcontrol.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/llxml')

diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h
index b88f388a0b..871d887136 100644
--- a/indra/llxml/llcontrol.h
+++ b/indra/llxml/llcontrol.h
@@ -48,6 +48,7 @@ protected:
 	BOOL			mHasRange;
 	BOOL			mPersist;
 	BOOL            mIsDefault;
+
 	static	std::set<LLControlBase*>	mChangedControls;
 	static	std::list<S32>				mFreeIDs;//These lists are used to store the ID's of registered event listeners.
 	static	std::list<S32>				mUsedIDs;
@@ -152,7 +153,10 @@ public:
 		}
 	}
 
-	/*virtual*/ void resetToDefault() { mCurrent = mDefault; mIsDefault = TRUE;}
+	/*virtual*/ void resetToDefault() 
+	{ 
+		setValue(mDefault);
+	}
 
 	virtual	~LLControl()
 	{
-- 
cgit v1.2.3