merge

6 files changed, 56 insertions, 29 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index cae6a79ec8..3f8b8688d2 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1639,7 +1639,7 @@ if (WINDOWS)
         -E
         copy_if_different
         ${BUILT_SLPLUGIN}
-        ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
+        ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
       COMMENT "Copying SLPlugin executable to the runtime folder."
       )
 
diff --git a/indra/newview/llfloatertos.cpp b/indra/newview/llfloatertos.cpp
index d8aea2770f..8d2d48f1af 100644
--- a/indra/newview/llfloatertos.cpp
+++ b/indra/newview/llfloatertos.cpp
@@ -48,6 +48,7 @@
 #include "lluictrlfactory.h"
 #include "llvfile.h"
 #include "message.h"
+#include "llstartup.h"              // login_alert_done
 
 
 LLFloaterTOS::LLFloaterTOS(const LLSD& data)
@@ -206,6 +207,7 @@ void LLFloaterTOS::onCancel( void* userdata )
 {
 	LLFloaterTOS* self = (LLFloaterTOS*) userdata;
 	llinfos << "User disagrees with TOS." << llendl;
+	LLNotifications::instance().add("MustAgreeToLogIn", LLSD(), LLSD(), login_alert_done);
 
 	if(self->mReplyPumpName != "")
 	{
diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index e56d28e066..8bf769a132 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -50,7 +50,7 @@
 #include "llviewercontrol.h"
 #include "llurlsimstring.h"
 #include "llfloaterreg.h"
-#include "llfloatertos.h"
+#include "llnotifications.h"
 #include "llwindow.h"
 #if LL_LINUX || LL_SOLARIS
 #include "lltrans.h"
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 5576d446fa..477149194b 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -256,6 +256,7 @@ void release_start_screen();
 void reset_login();
 void apply_udp_blacklist(const std::string& csv);
 bool process_login_success_response();
+void transition_back_to_login_panel(const std::string& emsg);
 
 void callback_cache_name(const LLUUID& id, const std::string& firstname, const std::string& lastname, BOOL is_group)
 {
@@ -884,6 +885,18 @@ bool idle_startup()
 
 	if (STATE_LOGIN_CLEANUP == LLStartUp::getStartupState())
 	{
+		// Move the progress view in front of the UI immediately when login is performed
+		// this allows not to see main menu after Alt+Tab was pressed while login. EXT-744.
+		gViewerWindow->moveProgressViewToFront();
+
+		//reset the values that could have come in from a slurl
+		if (!gLoginHandler.getWebLoginKey().isNull())
+		{
+			gFirstname = gLoginHandler.getFirstName();
+			gLastname = gLoginHandler.getLastName();
+//			gWebLoginKey = gLoginHandler.getWebLoginKey();
+		}
+				
 		if (show_connect_box)
 		{
 			// TODO if not use viewer auth
@@ -1065,13 +1078,14 @@ bool idle_startup()
 
 	if(STATE_LOGIN_PROCESS_RESPONSE == LLStartUp::getStartupState()) 
 	{
-		bool transitionBackToLoginPanel = false;
 		std::ostringstream emsg;
+		emsg << "Login failed.\n";
 		if(LLLoginInstance::getInstance()->authFailure())
 		{
+			LL_INFOS("LLStartup") << "Login failed, LLLoginInstance::getResponse(): "
+			                      << LLLoginInstance::getInstance()->getResponse() << LL_ENDL;
 			// Still have error conditions that may need some 
 			// sort of handling.
-			emsg << "Login failed.\n";
 			std::string reason_response = LLLoginInstance::getInstance()->getResponse("reason");
 			std::string message_response = LLLoginInstance::getInstance()->getResponse("message");
 	
@@ -1109,10 +1123,20 @@ bool idle_startup()
 			}
 			else
 			{
-				transitionBackToLoginPanel = true;
+				// Don't pop up a notification in the TOS case because
+				// LLFloaterTOS::onCancel() already scolded the user.
+				if (reason_response != "tos")
+				{
+					LLSD args;
+					args["ERROR_MESSAGE"] = emsg.str();
+					LL_INFOS("LLStartup") << "Notification: " << args << LL_ENDL;
+					LLNotifications::instance().add("ErrorMessage", args, LLSD(), login_alert_done);
+				}
 
 				//setup map of datetime strings to codes and slt & local time offset from utc
 				LLStringOps::setupDatetimeInfo (gPacificDaylightTime);
+				transition_back_to_login_panel(emsg.str());
+				show_connect_box = true;
 			}
 		}
 		else if(LLLoginInstance::getInstance()->authSuccess())
@@ -1125,7 +1149,12 @@ bool idle_startup()
 			}
 			else
 			{
-				transitionBackToLoginPanel = false;
+				LLSD args;
+				args["ERROR_MESSAGE"] = emsg.str();
+				LL_INFOS("LLStartup") << "Notification: " << args << LL_ENDL;
+				LLNotifications::instance().add("ErrorMessage", args, LLSD(), login_alert_done);
+				transition_back_to_login_panel(emsg.str());
+				show_connect_box = true;
 			}
 		}
 		else
@@ -1138,23 +1167,6 @@ bool idle_startup()
 			set_startup_status(progress, auth_desc, auth_message);
 		}
 
-		if(transitionBackToLoginPanel)
-		{
-			if (gNoRender)
-			{
-				LL_WARNS("AppInit") << "Failed to login!" << LL_ENDL;
-				LL_WARNS("AppInit") << emsg << LL_ENDL;
-				exit(0);
-			}
-
-			// Bounce back to the login screen.
-			LLSD args;
-			args["ERROR_MESSAGE"] = emsg.str();
-			LLNotifications::instance().add("ErrorMessage", args, LLSD(), login_alert_done);
-			reset_login(); // calls LLStartUp::setStartupState( STATE_LOGIN_SHOW );
-			gSavedSettings.setBOOL("AutoLogin", FALSE);
-			show_connect_box = true;
-		}
 		return FALSE;
 	}
 
@@ -3080,3 +3092,17 @@ bool process_login_success_response()
 
 	return success;
 }
+
+void transition_back_to_login_panel(const std::string& emsg)
+{
+	if (gNoRender)
+	{
+		LL_WARNS("AppInit") << "Failed to login!" << LL_ENDL;
+		LL_WARNS("AppInit") << emsg << LL_ENDL;
+		exit(0);
+	}
+
+	// Bounce back to the login screen.
+	reset_login(); // calls LLStartUp::setStartupState( STATE_LOGIN_SHOW );
+	gSavedSettings.setBOOL("AutoLogin", FALSE);
+}
diff --git a/indra/newview/tests/lllogininstance_test.cpp b/indra/newview/tests/lllogininstance_test.cpp
index a84e796159..75db76df27 100644
--- a/indra/newview/tests/lllogininstance_test.cpp
+++ b/indra/newview/tests/lllogininstance_test.cpp
@@ -91,7 +91,7 @@ LLURLSimString LLURLSimString::sInstance;
 bool LLURLSimString::parse() { return true; }

 

 //-----------------------------------------------------------------------------

-#include "../llfloatertos.h"

+#include "llnotifications.h"

 #include "llfloaterreg.h"

 static std::string gTOSType;

 static LLEventPump * gTOSReplyPump = NULL;

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index af7c474b03..d8f0e9f5d9 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -195,6 +195,10 @@ class WindowsManifest(ViewerManifest):
         self.path(src='%s/secondlife-bin.exe' % self.args['configuration'], dst=self.final_exe())

 

         self.enable_crt_check()

+        # Plugin host application

+        self.path(os.path.join(os.pardir,

+                               'llplugin', 'slplugin', self.args['configuration'], "slplugin.exe"),

+                  "slplugin.exe")

         

         # need to get the llcommon.dll from the build directory as well

         if self.prefix(src=self.args['configuration'], dst=""):

@@ -234,11 +238,6 @@ class WindowsManifest(ViewerManifest):
                 self.path("openjpeg.dll")

             self.end_prefix()

 

-        # Plugin host application

-        if self.prefix(src='../llplugin/slplugin/%s' % self.args['configuration'], dst="llplugin"):

-            self.path("slplugin.exe")

-            self.end_prefix()

-

         # Media plugins - QuickTime

         if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):

             self.path("media_plugin_quicktime.dll")