diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2019-11-14 16:26:37 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2019-11-14 16:26:37 -0700 |
| commit | cf9014602df4efb863053acd24cfdabf3338b6ba (patch) | |
| tree | 5b88a90a473e3ab6f9e75a9f48c2caa811eae1a0 /indra/newview/llappviewer.cpp | |
| parent | e9c0a93f99c4e6a4844da1a93ac261c4b206b79b (diff) | |
Fix merge-related unitialized ptr deref crash on login
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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<LLUITranslationBridge>(); + LLSettingsType::initClass(trans); + // initialize SSE options LLVector4a::initClass(); |