livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move initialization of LLWearableType & LLSettingsType translation bridges further down in the initialization chain after the translation system has been initialized

meow-7.2.2
Ansariel 2020-07-22 01:29:22 +02:00
parent 73bd29b67b
commit 0364fb0532
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llappviewer.cpp
View File

@ -862,12 +862,14 @@ bool LLAppViewer::init()
// Start of the application
//
// initialize LLWearableType translation bridge.
// Memory will be cleaned up in ::cleanupClass()
LLWearableType::initParamSingleton(new LLUITranslationBridge());
// <FS:Ansariel> Move further down after translation system has been initialized
//// initialize LLWearableType translation bridge.
//// Memory will be cleaned up in ::cleanupClass()
//LLWearableType::initParamSingleton(new LLUITranslationBridge());
LLTranslationBridge::ptr_t trans = std::make_shared<LLUITranslationBridge>();
LLSettingsType::initClass(trans);
//LLTranslationBridge::ptr_t trans = std::make_shared<LLUITranslationBridge>();
//LLSettingsType::initClass(trans);
// </FS:Ansariel>
// initialize SSE options
LLVector4a::initClass();
@ -1041,6 +1043,15 @@ bool LLAppViewer::init()
// Setup LLTrans after LLUI::initClass has been called.
initStrings();
// <FS:Ansariel> Moved down here translation system has been initialized
// initialize LLWearableType translation bridge.
// Memory will be cleaned up in ::cleanupClass()
LLWearableType::initParamSingleton(new LLUITranslationBridge());
LLTranslationBridge::ptr_t trans = std::make_shared<LLUITranslationBridge>();
LLSettingsType::initClass(trans);
// </FS:Ansariel>
// Setup notifications after LLUI::initClass() has been called.
LLNotifications::instance();
LL_INFOS("InitInfo") << "Notifications initialized." << LL_ENDL ;