7 files changed, 34 insertions, 20 deletions

diff --git a/linden/indra/llcommon/llversion.h b/linden/indra/llcommon/llversion.h
index 2fb743f..00c3039 100644
--- a/linden/indra/llcommon/llversion.h
+++ b/linden/indra/llcommon/llversion.h
@@ -32,6 +32,6 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 18;
 const S32 LL_VERSION_PATCH = 2;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 1;
 
 #endif
diff --git a/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 1b9fdbe..e86b0d2 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.2.0";
-CFBundleGetInfoString = "Second Life version 1.18.2.0, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.2.1";
+CFBundleGetInfoString = "Second Life version 1.18.2.1, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index 87087f7..b897a67 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/indra/newview/Info-SecondLife.plist
@@ -32,7 +32,7 @@
                 </dict>
         </array>
         <key>CFBundleVersion</key>
-        <string>1.18.2.0</string>
+        <string>1.18.2.1</string>
         <key>CSResourcesFileMapped</key>
         <true/>
 </dict>
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 208bb7c..7c76634 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -565,7 +565,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
 
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index 9ce0bfd..86f8c6d 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,3 +1,12 @@
+Release Notes for Second Life 1.18.2(1) September 19, 2007
+=====================================
+
+Changes:
+* Fix URL handler exploit described here: http://blog.secondlife.com/2007/09/18/second-life-url-handler-exploit/
+* Update voice components to improve quality and address VWR-1532
+* Add name of viewer release channel to embedded browser agent ID string
+
+
 Release Notes for Second Life 1.18.2(0) August 10, 2007
 =====================================
 
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 20e568e..e5f4f5d 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,2,0
- PRODUCTVERSION 1,18,2,0
+ FILEVERSION 1,18,2,1
+ PRODUCTVERSION 1,18,2,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -245,12 +245,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.18.2.0"
+            VALUE "FileVersion", "1.18.2.1"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.18.2.0"
+            VALUE "ProductVersion", "1.18.2.1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/viewer.cpp b/linden/indra/newview/viewer.cpp
index 2890269..69e98f4 100644
--- a/linden/indra/newview/viewer.cpp
+++ b/linden/indra/newview/viewer.cpp
@@ -944,11 +944,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]);
-                        gConnectToSomething = TRUE;
-                }
         }
 
         if (!strcmp(gUserServerName, gUserServerDomainName[USERSERVER_AGNI].mName))
@@ -5346,18 +5341,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)) 
                 {
@@ -5631,13 +5621,25 @@ 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]);
                         gConnectToSomething = TRUE;
+                        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]);
                         gConnectToSomething = TRUE;
+                        gArgs += argv[j];
+                        return 0;
                 }
                 else if (!strcmp(argv[j], "-ignorepixeldepth"))
                 {