From 39affbc54410569eb5694f30d10b9edd591f0f5f Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
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/llcommon/llversionviewer.h | 2 +-
indra/llxml/llcontrol.cpp | 4 ++++
indra/llxml/llcontrol.h | 5 ++++-
indra/newview/English.lproj/InfoPlist.strings | 4 ++--
indra/newview/Info-SecondLife.plist | 2 +-
indra/newview/llappviewer.cpp | 3 +++
6 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index f8b193d643..65db226ff9 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 19;
const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 4;
+const S32 LL_VERSION_BUILD = 5;
const char * const LL_CHANNEL = "Second Life Release";
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);
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 7ecd693ba4..608a6ad733 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.19.0.4";
-CFBundleGetInfoString = "Second Life version 1.19.0.4, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.19.0.5";
+CFBundleGetInfoString = "Second Life version 1.19.0.5, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 50226d84aa..e257d6f3aa 100644
--- a/indra/newview/Info-SecondLife.plist
+++ b/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.19.0.4</string>
+ <string>1.19.0.5</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 61699d21c8..803c8325c2 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -553,6 +553,8 @@ int parse_args(int argc, char **argv)
for (j = 1; j < argc; j++)
{
+ // Used to show first chunk of each argument passed in the
+ // window title.
gArgs += argv[j];
gArgs += " ";
@@ -841,6 +843,7 @@ int parse_args(int argc, char **argv)
// that someone can use IE (or potentially other browsers)
// and do the rough equivalent of command injection and
// steal passwords. Phoenix. SL-55321
+ return 0;
}
else if (!strcmp(argv[j], "-ignorepixeldepth"))
{
--
cgit v1.2.3