livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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"
master
Josh Bell 2008-02-29 01:18:00 +00:00
parent 2fdd7c35f3
commit 39affbc544
6 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llversionviewer.h
View File

@ -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";

4
indra/llxml/llcontrol.cpp
View File

@ -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:

5
indra/llxml/llcontrol.h
View File

@ -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);

4
indra/newview/English.lproj/InfoPlist.strings
View File

@ -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.";

2
indra/newview/Info-SecondLife.plist
View File

@ -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>

3
indra/newview/llappviewer.cpp
View File

@ -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"))
{