[sldev] Source release for release branch 2007-Sep-20

[Nicholaz Beresford]

I have a viewer build released based on 3(4).  Checked the source
changes for 3(5) today, it's just two screen pages (mainly the
security fix).

I'm attaching the diff if anyone wants to look or apply.


Nick

Second Life from the inside out:
http://nicholaz-beresford.blogspot.com/

-------------- next part --------------
diff -urN -X srcdiff.ind --strip-trailing-cr sl1_18_3_4\linden-orig\indra/llcommon/llversionviewer.h sl1_18_3_5\linden-orig\indra/llcommon/llversionviewer.h
--- sl1_18_3_4\linden-orig\indra/llcommon/llversionviewer.h	2007-09-14 13:56:54.000000000 +0200
+++ sl1_18_3_5\linden-orig\indra/llcommon/llversionviewer.h	2007-09-20 12:36:46.000000000 +0200
@@ -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 -urN -X srcdiff.ind --strip-trailing-cr sl1_18_3_4\linden-orig\indra/newview/Info-SecondLife.plist sl1_18_3_5\linden-orig\indra/newview/Info-SecondLife.plist
--- sl1_18_3_4\linden-orig\indra/newview/Info-SecondLife.plist	2007-09-14 13:56:56.000000000 +0200
+++ sl1_18_3_5\linden-orig\indra/newview/Info-SecondLife.plist	2007-09-20 12:36:50.000000000 +0200
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.18.3.4</string>
+	<string>1.18.3.5</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff -urN -X srcdiff.ind --strip-trailing-cr sl1_18_3_4\linden-orig\indra/newview/llstartup.cpp sl1_18_3_5\linden-orig\indra/newview/llstartup.cpp
--- sl1_18_3_4\linden-orig\indra/newview/llstartup.cpp	2007-09-14 13:56:58.000000000 +0200
+++ sl1_18_3_5\linden-orig\indra/newview/llstartup.cpp	2007-09-20 12:36:50.000000000 +0200
@@ -568,7 +568,10 @@
 #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 @@
 #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 @@
 		}
 		else
 		{
-			LLStartUp::setStartupState( STATE_WORLD_INIT );
+			LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );
 		}
 		return;
 	}
diff -urN -X srcdiff.ind --strip-trailing-cr sl1_18_3_4\linden-orig\indra/newview/res/newViewRes.rc sl1_18_3_5\linden-orig\indra/newview/res/newViewRes.rc
--- sl1_18_3_4\linden-orig\indra/newview/res/newViewRes.rc	2007-09-14 13:56:58.000000000 +0200
+++ sl1_18_3_5\linden-orig\indra/newview/res/newViewRes.rc	2007-09-20 12:36:50.000000000 +0200
@@ -227,8 +227,8 @@
 //
 
 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
             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 -urN -X srcdiff.ind --strip-trailing-cr sl1_18_3_4\linden-orig\indra/newview/viewer.cpp sl1_18_3_5\linden-orig\indra/newview/viewer.cpp
--- sl1_18_3_4\linden-orig\indra/newview/viewer.cpp	2007-09-14 13:56:58.000000000 +0200
+++ sl1_18_3_5\linden-orig\indra/newview/viewer.cpp	2007-09-20 12:36:50.000000000 +0200
@@ -946,10 +946,6 @@
 			// 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 @@
 	// 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 @@
 		// 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"))
 		{