diff options
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 27 |
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) |