1. simon_linden
  2. viewer-rabbit

Commits

Paul ProductEngine  committed 8036304

STORM-1083 FIXED Using -login client parameter always results in a last location unavailable error message

- In case of using "login" or "autologin" command-line parameters, URL of the start location should be set during configuration initialization of application. This is because there won't be ability to set it before login state (panel login won't be shown).

  • Participants
  • Parent commits 33ca961
  • Branches default

Comments (0)

Files changed (1)

File indra/newview/llappviewer.cpp

View file
 		}
 	}
 
+	// If automatic login from command line with --login switch
+	// init StartSLURL location. In interactive login, LLPanelLogin
+	// will take care of it.
+	if ((clp.hasOption("login") || clp.hasOption("autologin")) && !clp.hasOption("url") && !clp.hasOption("slurl"))
+	{
+		LLStartUp::setStartSLURL(LLSLURL(gSavedSettings.getString("LoginLocation")));
+	}
+
 	if (!gSavedSettings.getBOOL("AllowMultipleViewers"))
 	{
 	    //