From d6030c7376b930d0bfc40c29ec9888e3db851c06 Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 12 Aug 2019 19:54:20 +0300
Subject: SL-11719 Initialize the conversation dialog on login screen
 appearance to avoid crash

---
 indra/newview/llstartup.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 82e1d6be4a..e4cabbaddd 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -806,6 +806,8 @@ bool idle_startup()
 		gLoginMenuBarView->setEnabled( TRUE );
 		show_debug_menus();
 
+        LLConversationLog::initParamSingleton();
+
 		// Hide the splash screen
 		LLSplashScreen::hide();
 		// Push our window frontmost
@@ -1288,8 +1290,6 @@ bool idle_startup()
 
 		display_startup();
 		LLStartUp::setStartupState( STATE_MULTIMEDIA_INIT );
-		
-		LLConversationLog::initParamSingleton();
 
 		return FALSE;
 	}
-- 
cgit v1.2.3