diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-08-12 19:54:20 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-08-12 19:54:20 +0300 |
| commit | d6030c7376b930d0bfc40c29ec9888e3db851c06 (patch) | |
| tree | e1e1b79bc8e8ba23d1ebc9d7c1aa8916610f8c9e /indra | |
| parent | 1be08814e252654db98ce8c39dc8b4cf89c2e1dc (diff) | |
SL-11719 Initialize the conversation dialog on login screen appearance to avoid crash
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |