From 0364fb0532cc5fbe9f23e5c1008bcf8eae75137b Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 22 Jul 2020 01:29:22 +0200 Subject: [PATCH] Move initialization of LLWearableType & LLSettingsType translation bridges further down in the initialization chain after the translation system has been initialized --- indra/newview/llappviewer.cpp | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index beb36fa142..6369e18e9a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -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()); + // 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(); - LLSettingsType::initClass(trans); + //LLTranslationBridge::ptr_t trans = std::make_shared(); + //LLSettingsType::initClass(trans); + // // initialize SSE options LLVector4a::initClass(); @@ -1041,6 +1043,15 @@ bool LLAppViewer::init() // Setup LLTrans after LLUI::initClass has been called. initStrings(); + // 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(); + LLSettingsType::initClass(trans); + // + // Setup notifications after LLUI::initClass() has been called. LLNotifications::instance(); LL_INFOS("InitInfo") << "Notifications initialized." << LL_ENDL ;