From 863a59f013c927c4787866d656c99e8af9262caa Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:09 -0500
Subject: Second Life viewer sources 1.18.3.5-RC
---
linden/indra/llcommon/llversionviewer.h | 2 +-
.../indra/newview/English.lproj/InfoPlist.strings | 4 ++--
linden/indra/newview/Info-SecondLife.plist | 2 +-
linden/indra/newview/llstartup.cpp | 9 ++++++---
linden/indra/newview/releasenotes.txt | 9 +++++++++
linden/indra/newview/res/newViewRes.rc | 8 ++++----
linden/indra/newview/viewer.cpp | 23 ++++++++++++----------
linden/indra/newview/viewer_manifest.py | 2 +-
8 files changed, 37 insertions(+), 22 deletions(-)
(limited to 'linden')
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index 78369d9..747381f 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -32,7 +32,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 18;
const S32 LL_VERSION_PATCH = 3;
-const S32 LL_VERSION_BUILD = 4;
+const S32 LL_VERSION_BUILD = 5;
const char * const LL_CHANNEL = "Second Life Release";
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 9b09bc3..420236c 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Second Life";
-CFBundleShortVersionString = "Second Life version 1.18.3.4";
-CFBundleGetInfoString = "Second Life version 1.18.3.4, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.3.5";
+CFBundleGetInfoString = "Second Life version 1.18.3.5, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index 955532b..263babe 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
CFBundleVersion
- 1.18.3.4
+ 1.18.3.5
CSResourcesFileMapped
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 3f02f6a..2623b05 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -568,7 +568,10 @@ BOOL idle_startup()
#endif // LL_LINUX
std::ostringstream codec;
- codec << "[Second Life " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD << "]";
+ codec << "[Second Life ";
+ codec << "(" << gChannelName << ")";
+ codec << " - " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH << "." << LL_VERSION_BUILD;
+ codec << "]";
LLMozLib::getInstance()->setBrowserAgentId( codec.str() );
#endif
@@ -2633,7 +2636,7 @@ void update_dialog_callback(S32 option, void *userdata)
#if !LL_RELEASE_FOR_DOWNLOAD
if (option == 2)
{
- LLStartUp::setStartupState( STATE_WORLD_INIT );
+ LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
return;
}
#endif
@@ -2649,7 +2652,7 @@ void update_dialog_callback(S32 option, void *userdata)
}
else
{
- LLStartUp::setStartupState( STATE_WORLD_INIT );
+ LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
}
return;
}
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index db83da9..616dcaa 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,12 @@
+Release Notes for Second Life 1.18.3(5) September 20, 2007
+=====================================
+Bug fixes:
+* Fixed login failure when declining optional updates
+* Fixed VWR-2487: Covenant Details between live version and release candidate version
+* Fixed VWR-2484: Icons missing from Mac OS X build
+* Fixed VWR-2482: build tree misses the cursors_mac directory
+* Fixed VWR-2378: Failure to enable the "Update" button in the profile/classifieds tab, after a "Set Location" update.
+
Release Notes for Second Life 1.18.3(4) September 14, 2007
=====================================
Bug fixes:
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 11cfe63..670e4e8 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -227,8 +227,8 @@ TOOLPIPETTE CURSOR "toolpipette.cur"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,18,3,4
- PRODUCTVERSION 1,18,3,4
+ FILEVERSION 1,18,3,5
+ PRODUCTVERSION 1,18,3,5
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -245,12 +245,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Linden Lab"
VALUE "FileDescription", "Second Life"
- VALUE "FileVersion", "1.18.3.4"
+ VALUE "FileVersion", "1.18.3.5"
VALUE "InternalName", "Second Life"
VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc."
VALUE "OriginalFilename", "SecondLife.exe"
VALUE "ProductName", "Second Life"
- VALUE "ProductVersion", "1.18.3.4"
+ VALUE "ProductVersion", "1.18.3.5"
END
END
BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/viewer.cpp b/linden/indra/newview/viewer.cpp
index d42872d..8f37bc3 100644
--- a/linden/indra/newview/viewer.cpp
+++ b/linden/indra/newview/viewer.cpp
@@ -946,10 +946,6 @@ int main( int argc, char **argv )
// May need to know this early also
gDisableVoice = TRUE;
}
- else if (!strcmp(argv[j], "-url") && (++j < argc))
- {
- LLURLSimString::setString(argv[j]);
- }
}
if (!strcmp(gUserServerName, gUserServerDomainName[USERSERVER_AGNI].mName))
@@ -5344,18 +5340,13 @@ int parse_args(int argc, char **argv)
// Sometimes IP addresses passed in on the command line have leading
// or trailing white space. Use LLString to clean that up.
LLString ip_string;
-
S32 j;
- // agent_sim_host holds the settings for connecting to the first simulator.
- for (j = 1; j < argc; j++)
+ for (j = 1; j < argc; j++)
{
gArgs += argv[j];
gArgs += " ";
- }
- for (j = 1; j < argc; j++)
- {
LLString argument = argv[j];
if ((!strcmp(argv[j], "-port")) && (++j < argc))
{
@@ -5613,11 +5604,23 @@ int parse_args(int argc, char **argv)
// so this allows us to parse the URL straight off the command line without a "-url" paramater
else if (!argument.compare(0, std::string( "secondlife://" ).length(), std::string("secondlife://")))
{
+ // *NOTE: After setting the url, bail. What can happen is
+ // that someone can use IE (or potentially other browsers)
+ // and do the rough equivalent of command injection and
+ // steal passwords. Phoenix. SL-55321
LLURLSimString::setString(argv[j]);
+ gArgs += argv[j];
+ return 0;
}
else if (!strcmp(argv[j], "-url") && (++j < argc))
{
+ // *NOTE: After setting the url, bail. What can happen is
+ // that someone can use IE (or potentially other browsers)
+ // and do the rough equivalent of command injection and
+ // steal passwords. Phoenix. SL-55321
LLURLSimString::setString(argv[j]);
+ gArgs += argv[j];
+ return 0;
}
else if (!strcmp(argv[j], "-ignorepixeldepth"))
{
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 3641bcf..20d96ce 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -358,7 +358,7 @@ class DarwinManifest(ViewerManifest):
self.path("licenses-mac.txt", dst="licenses.txt")
self.path("featuretable_mac.txt")
-# self.path("secondlife.icns")
+ self.path("secondlife.icns")
# llkdu dynamic library
# self.path("../../libraries/universal-darwin/lib_release/libllkdu.dylib", "libllkdu.dylib")
--
cgit v1.1