diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-29 01:18:00 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-29 01:18:00 +0000 |
| commit | 39affbc54410569eb5694f30d10b9edd591f0f5f (patch) | |
| tree | 06a2348990a490ccb5aef282a1ebe4dee7aa5171 /indra/llxml | |
| parent | 2fdd7c35f33d1d98091547b8e96ad9ebf99dee47 (diff) | |
svn merge -r80947:81066 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer
* Respect pre-1.19.0 voice settings
* Re-fix DEV-11213 "SECURITY: Web site can use IFRAME to launch SL and steal your password"
Diffstat (limited to 'indra/llxml')
| -rw-r--r-- | indra/llxml/llcontrol.cpp | 4 | ||||
| -rw-r--r-- | indra/llxml/llcontrol.h | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 78b2181e86..d3778853dd 100644 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -682,6 +682,8 @@ U32 LLControlGroup::loadFromFileLegacy(const LLString& filename, BOOL require_de llassert(control); + mLoadedSettings.insert(name); + switch(control->mType) { case TYPE_F32: @@ -905,6 +907,8 @@ U32 LLControlGroup::loadFromFile(const LLString& filename, BOOL require_declarat llassert(control); + mLoadedSettings.insert(name); + switch(control->mType) { case TYPE_F32: diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index 849118a75b..a1a2a4c851 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -200,11 +200,14 @@ public: typedef std::map<LLString, LLPointer<LLControlBase> > ctrl_name_table_t; ctrl_name_table_t mNameTable; std::set<LLString> mWarnings; - + std::set<LLString> mLoadedSettings; // Filled in with names loaded from settings.xml + public: LLControlGroup(); ~LLControlGroup(); void cleanup(); + bool hasLoaded(const LLString& name) { return mLoadedSettings.find(name) != mLoadedSettings.end(); } + void clearLoaded() { mLoadedSettings.clear(); } // Call once we've done any settings tweaks which may need this data LLControlBase* getControl(const LLString& name); LLSD registerListener(const LLString& name, LLSimpleListenerObservable *listener); |