diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-27 22:58:52 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-27 22:58:52 +0200 |
| commit | bc496f5f17a446af27b47cbe227e7e85089bab8d (patch) | |
| tree | b7c90fee48d1f48e21c5f62fe84abaca16f8bb81 /indra/newview/llexternaleditor.cpp | |
| parent | 91c311dd7beb8d723a00efac8e61019eeb8af17b (diff) | |
| parent | f89c9e9b20a13acd8f6af76699259cab4c74d5db (diff) | |
Downstream merge from lindenlab/viewer-lynx
Diffstat (limited to 'indra/newview/llexternaleditor.cpp')
| -rw-r--r-- | indra/newview/llexternaleditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llexternaleditor.cpp b/indra/newview/llexternaleditor.cpp index 776bbf78c2..b66eb754a4 100644 --- a/indra/newview/llexternaleditor.cpp +++ b/indra/newview/llexternaleditor.cpp @@ -184,9 +184,9 @@ std::string LLExternalEditor::findCommand( cmd = override; LL_INFOS() << "Using override" << LL_ENDL; } - else if (!LLUI::sSettingGroups["config"]->getString(sSetting).empty()) + else if (!LLUI::getInstance()->mSettingGroups["config"]->getString(sSetting).empty()) { - cmd = LLUI::sSettingGroups["config"]->getString(sSetting); + cmd = LLUI::getInstance()->mSettingGroups["config"]->getString(sSetting); LL_INFOS() << "Using setting" << LL_ENDL; } else // otherwise use the path specified by the environment variable |