aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llxml/llcontrol.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:32 -0500
committerJacek Antonelli2008-08-15 23:45:32 -0500
commitd77dde207b00abbc05269773b108e71aeb48209c (patch)
treeb96bb49b3774d68b8ddf66dd81d6000672c2ff0f /linden/indra/llxml/llcontrol.h
parentSecond Life viewer sources 1.19.0.4 (diff)
downloadmeta-impy-d77dde207b00abbc05269773b108e71aeb48209c.zip
meta-impy-d77dde207b00abbc05269773b108e71aeb48209c.tar.gz
meta-impy-d77dde207b00abbc05269773b108e71aeb48209c.tar.bz2
meta-impy-d77dde207b00abbc05269773b108e71aeb48209c.tar.xz
Second Life viewer sources 1.19.0.5
Diffstat (limited to 'linden/indra/llxml/llcontrol.h')
-rw-r--r--linden/indra/llxml/llcontrol.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/linden/indra/llxml/llcontrol.h b/linden/indra/llxml/llcontrol.h
index 4a86adf..e717bf1 100644
--- a/linden/indra/llxml/llcontrol.h
+++ b/linden/indra/llxml/llcontrol.h
@@ -200,11 +200,14 @@ public:
200 typedef std::map<LLString, LLPointer<LLControlBase> > ctrl_name_table_t; 200 typedef std::map<LLString, LLPointer<LLControlBase> > ctrl_name_table_t;
201 ctrl_name_table_t mNameTable; 201 ctrl_name_table_t mNameTable;
202 std::set<LLString> mWarnings; 202 std::set<LLString> mWarnings;
203 203 std::set<LLString> mLoadedSettings; // Filled in with names loaded from settings.xml
204
204public: 205public:
205 LLControlGroup(); 206 LLControlGroup();
206 ~LLControlGroup(); 207 ~LLControlGroup();
207 void cleanup(); 208 void cleanup();
209 bool hasLoaded(const LLString& name) { return mLoadedSettings.find(name) != mLoadedSettings.end(); }
210 void clearLoaded() { mLoadedSettings.clear(); } // Call once we've done any settings tweaks which may need this data
208 211
209 LLControlBase* getControl(const LLString& name); 212 LLControlBase* getControl(const LLString& name);
210 LLSD registerListener(const LLString& name, LLSimpleListenerObservable *listener); 213 LLSD registerListener(const LLString& name, LLSimpleListenerObservable *listener);