1 files changed, 89 insertions, 10 deletions

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index e95180c..a2d70af 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -251,8 +251,6 @@ LLString gDisabledMessage; // Set in LLAppViewer::initConfiguration used in idle
 
 BOOL gHideLinks = FALSE; // Set in LLAppViewer::initConfiguration, used externally
 
-BOOL gInProductionGrid  = FALSE; 
-
 BOOL                            gAllowIdleAFK = TRUE;
 F32                                     gAFKTimeout = DEFAULT_AFK_TIMEOUT;
 BOOL                            gShowObjectUpdates = FALSE;
@@ -371,6 +369,7 @@ static LLString gWindowTitle;
         static char sWindowClass[] = "Second Life";
 #endif
 
+std::string gLoginPage;
 std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
 
@@ -379,6 +378,7 @@ static const char USAGE[] = "\n"
 "options:\n"
 " -login <first> <last> <password>     log in as a user\n"
 " -autologin                           log in as last saved user\n"
+" -loginpage <URL>                     login authentication page to use\n"
 " -loginuri <URI>                      login server and CGI script to use\n"
 " -helperuri <URI>                     helper web CGI prefix to use\n"
 " -settings <filename>                 specify the filename of a\n"
@@ -628,6 +628,41 @@ int parse_args(int argc, char **argv)
                         gGridChoice = GRID_INFO_UMA;
                         sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
                 }
+                else if (!strcmp(argv[j], "--mohini"))
+                {
+                        gGridChoice = GRID_INFO_MOHINI;
+                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
+                }
+                else if (!strcmp(argv[j], "--yami"))
+                {
+                        gGridChoice = GRID_INFO_YAMI;
+                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
+                }
+                else if (!strcmp(argv[j], "--nandi"))
+                {
+                        gGridChoice = GRID_INFO_NANDI;
+                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
+                }
+                else if (!strcmp(argv[j], "--mitra"))
+                {
+                        gGridChoice = GRID_INFO_MITRA;
+                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
+                }
+                else if (!strcmp(argv[j], "--radha"))
+                {
+                        gGridChoice = GRID_INFO_RADHA;
+                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
+                }
+                else if (!strcmp(argv[j], "--ravi"))
+                {
+                        gGridChoice = GRID_INFO_RAVI;
+                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
+                }
+                else if (!strcmp(argv[j], "--aruna"))
+                {
+                        gGridChoice = GRID_INFO_ARUNA;
+                        sprintf(gGridName,"%s", gGridInfo[gGridChoice].mName);
+                }
                 else if (!strcmp(argv[j], "-user") && (++j < argc)) 
                 {
                         if (!strcmp(argv[j], "-"))
@@ -643,6 +678,10 @@ int parse_args(int argc, char **argv)
                                 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]));
+                }
                 else if (!strcmp(argv[j], "-loginuri") && (++j < argc))
                 {
             LLAppViewer::instance()->addLoginURI(utf8str_trim(argv[j]));
@@ -1866,6 +1905,34 @@ bool LLAppViewer::initEarlyConfiguration()
                 {
                         sprintf(gGridName,"%s", gGridInfo[GRID_INFO_UMA].mName);
                 }
+                else if (!strcmp(argv[j], "--mohini"))
+                {
+                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_MOHINI].mName);
+                }
+                else if (!strcmp(argv[j], "--yami"))
+                {
+                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_YAMI].mName);
+                }
+                else if (!strcmp(argv[j], "--nandi"))
+                {
+                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_NANDI].mName);
+                }
+                else if (!strcmp(argv[j], "--mitra"))
+                {
+                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_MITRA].mName);
+                }
+                else if (!strcmp(argv[j], "--radha"))
+                {
+                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_RADHA].mName);
+                }
+                else if (!strcmp(argv[j], "--ravi"))
+                {
+                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_RAVI].mName);
+                }
+                else if (!strcmp(argv[j], "--aruna"))
+                {
+                        sprintf(gGridName,"%s", gGridInfo[GRID_INFO_ARUNA].mName);
+                }
                 else if (!strcmp(argv[j], "-user") && (++j < argc))
                 {
                         if (!strcmp(argv[j], "-"))
@@ -2292,11 +2359,6 @@ bool LLAppViewer::doConfigFromCommandLine()
                 removeMarkerFile();
                 return false;
         }
-        
-        if (!strcmp(gGridName, gGridInfo[GRID_INFO_AGNI].mName))
-        {
-                gInProductionGrid = TRUE;
-        }
 
         return true;
 }
@@ -2540,7 +2602,7 @@ bool LLAppViewer::anotherInstanceRunning()
         llinfos << "Checking marker file for lock..." << llendl;
 
         // If file doesn't exist, we create it
-        // If file does exist, try to get writing privilages
+        // If file does exist, try to get writing privileges
         FILE* fMarker = LLFile::fopen(marker_file.c_str(), "rb");               // Flawfinder: ignore
         if (fMarker != NULL)
         {
@@ -2555,7 +2617,7 @@ bool LLAppViewer::anotherInstanceRunning()
 
                 // *FIX:Mani - rather than have this exception here, 
                 // LLFile::fopen() have consistent behavior across platforms?
-#if LL_DARWIN
+#if LL_DARWIN || LL_LINUX || LL_SOLARIS
                 // Try to lock it. On Mac, this is the only way to test if it's actually locked.
                 if (flock(fileno(fMarker), LOCK_EX | LOCK_NB) == -1)
                 {
@@ -2601,7 +2663,7 @@ void LLAppViewer::initMarkerFile()
                         llinfos << "Marker file is locked." << llendl;
                         return;
                 }
-#if LL_DARWIN
+#if LL_DARWIN || LL_LINUX || LL_SOLARIS
                 // Try to lock it. On Mac, this is the only way to test if it's actually locked.
                 if (flock(fileno(fMarker), LOCK_EX | LOCK_NB) == -1)
                 {
@@ -3044,6 +3106,17 @@ void LLAppViewer::setHelperURI(const std::string& uri)
     gHelperURI = uri;
 }
 
+void LLAppViewer::setLoginPage(const std::string& login_page)
+{
+        gLoginPage = login_page;
+}
+
+const std::string& LLAppViewer::getLoginPage()
+{
+        return gLoginPage;
+}
+
+
 // Callback from a dialog indicating user was logged out.  
 void finish_disconnect(S32 option, void* userdata)
 {
@@ -3172,6 +3245,12 @@ void LLAppViewer::saveNameCache()
         }
 }
 
+bool LLAppViewer::isInProductionGrid()
+{
+    return (GRID_INFO_AGNI == gGridChoice);
+}
+
+
 /*!     @brief          This class is an LLFrameTimer that can be created with
                                 an elapsed time that starts counting up from the given value
                                 rather than 0.0.