Fixups after the latest merge with viewer-2.0.0-3. Updated LLLoginInstance to use the new LLFloaterReg way of getting hold of floaters.

1 files changed, 10 insertions, 8 deletions

diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp
index f967fcaf97..3c59cb83cd 100644
--- a/indra/newview/lllogininstance.cpp
+++ b/indra/newview/lllogininstance.cpp
@@ -49,6 +49,7 @@
 #include "llviewernetwork.h"
 #include "llviewercontrol.h"
 #include "llurlsimstring.h"
+#include "llfloaterreg.h"
 #include "llfloatertos.h"
 #include "llwindow.h"
 #if LL_LINUX || LL_SOLARIS
@@ -221,18 +222,19 @@ bool LLLoginInstance::handleLoginFailure(const LLSD& event)
 		// to reconnect or to end the attempt in failure.
 		if(reason_response == "tos")
 		{
-			LLFloaterTOS::show(LLFloaterTOS::TOS_TOS,
-								message_response,
-								boost::bind(&LLLoginInstance::handleTOSResponse, 
+			LLFloaterTOS * tos =
+				LLFloaterReg::showTypedInstance<LLFloaterTOS>("message_tos", LLSD(message_response));
+
+			tos->setTOSCallback(boost::bind(&LLLoginInstance::handleTOSResponse,
 											this, _1, "agree_to_tos"));
 		}
 		else if(reason_response == "critical")
 		{
-			LLFloaterTOS::show(LLFloaterTOS::TOS_CRITICAL_MESSAGE,
-								message_response,
-								boost::bind(&LLLoginInstance::handleTOSResponse, 
-												this, _1, "read_critical")
-											);
+			LLFloaterTOS * tos =
+				LLFloaterReg::showTypedInstance<LLFloaterTOS>("message_critical",LLSD(message_response));
+
+			tos->setTOSCallback(boost::bind(&LLLoginInstance::handleTOSResponse,
+											this, _1, "read_critical"));
 		}
 		else if(reason_response == "update" || gSavedSettings.getBOOL("ForceMandatoryUpdate"))
 		{