From cf9014602df4efb863053acd24cfdabf3338b6ba Mon Sep 17 00:00:00 2001 From: Dave Houlton Date: Thu, 14 Nov 2019 16:26:37 -0700 Subject: Fix merge-related unitialized ptr deref crash on login --- indra/newview/llappviewer.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 32ee632838..3d5722353a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -774,6 +774,10 @@ bool LLAppViewer::init() // Memory will be cleaned up in ::cleanupClass() LLWearableType::initParamSingleton(new LLUITranslationBridge()); + // initialize the LLSettingsType translation bridge. + LLTranslationBridge::ptr_t trans = std::make_shared(); + LLSettingsType::initClass(trans); + // initialize SSE options LLVector4a::initClass(); -- cgit v1.2.3