diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2019-08-12 09:58:08 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2019-08-12 09:58:08 -0400 |
| commit | 5a72d34b7676031da35f93c91eda3eab01085aff (patch) | |
| tree | 4677bc0b7330af7ff142d286eb4feee5126a8d7e /indra/newview/llexternaleditor.cpp | |
| parent | f0fa4f94a5400fe5d21cf5bf7570129916bf9787 (diff) | |
| parent | 98be6e141c1232bad28cc115bc7092f175b18809 (diff) | |
Automated merge with file:///Users/nat/linden/viewer-catch
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 |