From 39affbc54410569eb5694f30d10b9edd591f0f5f Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Fri, 29 Feb 2008 01:18:00 +0000 Subject: 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" --- indra/llxml/llcontrol.cpp | 4 ++++ indra/llxml/llcontrol.h | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'indra/llxml') 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 > ctrl_name_table_t; ctrl_name_table_t mNameTable; std::set mWarnings; - + std::set 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); -- cgit v1.2.3