diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2026-02-04 17:04:26 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2026-02-04 17:05:15 +0200 |
| commit | 459bd1e943de916d4d50e2b918da756a0526f88b (patch) | |
| tree | 27efdfa3fb4cabc4c203669caf351791a4ba9ece /indra/newview/llexternaleditor.cpp | |
| parent | c5c9b1fe1e69ca8b406f9bbffa8218e2687ea1ce (diff) | |
| parent | b4a6af57a667d355e7347f1a3c13173b44b361ff (diff) | |
Merge branch 'release/2026.01' into project/voice_moderation
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 193a42f9f6..c3aad4ee65 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\""; #endif |