aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llxml/llcontrol.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/llxml/llcontrol.h
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz
Second Life viewer sources 1.14.0.0
Diffstat (limited to '')
-rw-r--r--linden/indra/llxml/llcontrol.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/llxml/llcontrol.h b/linden/indra/llxml/llcontrol.h
index 846a3b5..ca5f711 100644
--- a/linden/indra/llxml/llcontrol.h
+++ b/linden/indra/llxml/llcontrol.h
@@ -67,6 +67,7 @@ protected:
67 BOOL mHasRange; 67 BOOL mHasRange;
68 BOOL mPersist; 68 BOOL mPersist;
69 BOOL mIsDefault; 69 BOOL mIsDefault;
70
70 static std::set<LLControlBase*> mChangedControls; 71 static std::set<LLControlBase*> mChangedControls;
71 static std::list<S32> mFreeIDs;//These lists are used to store the ID's of registered event listeners. 72 static std::list<S32> mFreeIDs;//These lists are used to store the ID's of registered event listeners.
72 static std::list<S32> mUsedIDs; 73 static std::list<S32> mUsedIDs;
@@ -171,7 +172,10 @@ public:
171 } 172 }
172 } 173 }
173 174
174 /*virtual*/ void resetToDefault() { mCurrent = mDefault; mIsDefault = TRUE;} 175 /*virtual*/ void resetToDefault()
176 {
177 setValue(mDefault);
178 }
175 179
176 virtual ~LLControl() 180 virtual ~LLControl()
177 { 181 {