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/newview | |
| 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/newview')
| -rw-r--r-- | indra/newview/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | indra/newview/Info-SecondLife.plist | 2 | ||||
| -rw-r--r-- | indra/newview/llappviewer.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
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")) { |