svn merge -r 79445:79449 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-5-merge-79386

QAR-242 merge of maintenance-5 (QAR-203)
* DEV-6548 Copy To Inventory fail to execute without any output feedback when Notecard has changes but not saved
* DEV-7600 Deleting someone else's object in god mode crashes sim
* DEV-5329 LLSD parsers should determine and set maximum parse sizes
* DEV-7473 Resolve instant message crash report
* DEV-2904 Presence Issues not (apparently) caused by scripted attachments
* DEV-7083 Investigate Null Folder IDs Bug that caused 470K inventory items with Null Folder IDS on the Grid
* DEV-2865 Textures/Snapshots in a notecard are opened again when you click copy to inventory.
* DEV-6612 VWR-3290: Linux scons build script doesn't work with distcc
* DEV-8002 c++ llsd notation parser accepts malformed data
* DEV-8001 c++ xml parse returns wrong number of elements parsed
* DEV-8089 Double delete in statc structured data parse functions
* DEV-5326 Any viewer can request presence information for any agent
* DEV-2378 python service builder does not sort query string
* DEV-7872 Block teleport off teen grid sub-estates like Schome Park / Open University
* DEV-4465 Add a "logfile" command line option to the sim to create log files

1 files changed, 0 insertions, 27 deletions

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 907f957bed..97f652d88d 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -390,7 +390,6 @@ static const char USAGE[] = "\n"
 " -set <variable> <value>              specify the value of a particular\n"
 "                                        configuration variable that\n"
 "                                        overrides all other settings\n"
-" -user <user_server_ip>               specify userserver in dotted quad\n"
 #if !LL_RELEASE_FOR_DOWNLOAD
 " -sim <simulator_ip>                  specify the simulator ip address\n"
 #endif
@@ -658,21 +657,6 @@ int parse_args(int argc, char **argv)
 			gGridChoice = GRID_INFO_YAMI;
 			sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
 		}
-		else if (!strcmp(argv[j], "-user") && (++j < argc)) 
-		{
-			if (!strcmp(argv[j], "-"))
-			{
-				gGridChoice = GRID_INFO_LOCAL;
-				snprintf(gGridName, MAX_STRING, "%s", LOOPBACK_ADDRESS_STRING);		// Flawfinder: ignore
-			}
-			else
-			{
-				gGridChoice = GRID_INFO_OTHER;
-				ip_string.assign( argv[j] );
-				LLString::trim(ip_string);
-				snprintf(gGridName, MAX_STRING, "%s", ip_string.c_str());		// Flawfinder: ignore
-			}
-		}
 		else if (!strcmp(argv[j], "-loginpage") && (++j < argc))
 		{
 			LLAppViewer::instance()->setLoginPage(utf8str_trim(argv[j]));
@@ -1927,17 +1911,6 @@ bool LLAppViewer::initEarlyConfiguration()
 		{
 			sprintf(gGridName,"%s", gGridInfo[GRID_INFO_ARUNA].mName);
 		}
-		else if (!strcmp(argv[j], "-user") && (++j < argc))
-		{
-			if (!strcmp(argv[j], "-"))
-			{
-				snprintf(gGridName, MAX_STRING, "%s", LOOPBACK_ADDRESS_STRING);		// Flawfinder: ignore 
-			}
-			else
-			{
-				snprintf(gGridName, MAX_STRING, "%s", argv[j]);		// Flawfinder: ignore 
-			}
-		}
 		else if (!strcmp(argv[j], "-multiple"))
 		{
 			// Hack to detect -multiple so we can disable the marker file check (which will always fail)