diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-02-05 20:20:42 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-02-05 20:20:42 +0000 |
| commit | d1582a5105f01181535fb859c530e45c2efca071 (patch) | |
| tree | f8c6939e2c67d64d7be0e2488af296b42f13800d /indra/llxml | |
| parent | 57be416ab7c9d93196231fb55de8ba563f3b29eb (diff) | |
merge -r 57111:57464 maintenance.
Diffstat (limited to 'indra/llxml')
| -rw-r--r-- | indra/llxml/llcontrol.h | 6 |
1 files changed, 5 insertions, 1 deletions
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() { |