diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 20:03:14 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 20:03:14 +0200 |
| commit | e4f6e7d842698c66061143283562dc86eec00405 (patch) | |
| tree | dafe34b658b91b934bd7174e8cb164f85e2ce57d /indra/newview/llexternaleditor.cpp | |
| parent | 3e0e141b7651a8ed20ec310fa4557d2a5c9fcd89 (diff) | |
| parent | 03db2ddc9c27cf842c6185826617b0da0d2b87f5 (diff) | |
Merged in lindenlab/viewer-release and incremented viewer version to 6.2.0
Diffstat (limited to 'indra/newview/llexternaleditor.cpp')
| -rw-r--r-- | indra/newview/llexternaleditor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llexternaleditor.cpp b/indra/newview/llexternaleditor.cpp index df9c848cb8..776bbf78c2 100644 --- a/indra/newview/llexternaleditor.cpp +++ b/indra/newview/llexternaleditor.cpp @@ -31,6 +31,7 @@ #include "llui.h" #include "llprocess.h" #include "llsdutil.h" +#include "llstring.h" #include <boost/foreach.hpp> // static @@ -188,12 +189,12 @@ std::string LLExternalEditor::findCommand( cmd = LLUI::sSettingGroups["config"]->getString(sSetting); LL_INFOS() << "Using setting" << LL_ENDL; } - else // otherwise use the path specified by the environment variable + else // otherwise use the path specified by the environment variable { - char* env_var_val = getenv(env_var.c_str()); + auto env_var_val(LLStringUtil::getoptenv(env_var)); if (env_var_val) { - cmd = env_var_val; + cmd = *env_var_val; LL_INFOS() << "Using env var " << env_var << LL_ENDL; } } |