diff options
| author | Erik Kundiman <erik@megapahit.org> | 2026-01-21 13:29:05 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2026-01-21 13:29:05 +0800 |
| commit | 71577cea319238b54b283a25ee9270e10f11a0bc (patch) | |
| tree | 8b26dee2fb5f56925c1dbd0c0e09be104677c46d /indra/newview/llexternaleditor.cpp | |
| parent | f301d1c4afa30b3a2845ea9b92a6ed0561e58b78 (diff) | |
| parent | ca6601cbb8d4ef9828466c8d1316ae28d0c7b7b8 (diff) | |
Merge tag 'Second_Life_Release#ca6601cb-2026.01' into 2026.01
Diffstat (limited to 'indra/newview/llexternaleditor.cpp')
| -rw-r--r-- | indra/newview/llexternaleditor.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llexternaleditor.cpp b/indra/newview/llexternaleditor.cpp index fcddf4afad..cc4e8973c4 100644 --- a/indra/newview/llexternaleditor.cpp +++ b/indra/newview/llexternaleditor.cpp @@ -46,9 +46,13 @@ LLExternalEditor::EErrorCode LLExternalEditor::setCommand(const std::string& env { LL_INFOS() << "Editor command is empty or not set, falling back to OS open handler" << LL_ENDL; #if LL_WINDOWS - static const std::string os_cmd = "%SystemRoot%\\explorer.exe \"%s\""; + std::string os_cmd = LLStringUtil::getenv("SystemRoot", ""); + if (!os_cmd.empty()) + { + os_cmd.append("\\explorer.exe \"%s\""); + } #elif LL_DARWIN - static const std::string os_cmd = "/usr/bin/open \"%s\""; + static const std::string os_cmd = "/usr/bin/open -t \"%s\""; #elif LL_LINUX static const std::string os_cmd = "/usr/bin/xdg-open \"%s\""; #elif __FreeBSD__ |