From fdd2eaec838fa549a3419b360654ff26a6764f58 Mon Sep 17 00:00:00 2001 From: Cinders Date: Fri, 17 May 2013 10:52:19 -0600 Subject: [PATCH] FIRE-10320 - One more time now that I've had coffee. --- indra/newview/llexternaleditor.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/newview/llexternaleditor.cpp b/indra/newview/llexternaleditor.cpp index 3fdec9f29a..913b7c2682 100644 --- a/indra/newview/llexternaleditor.cpp +++ b/indra/newview/llexternaleditor.cpp @@ -48,13 +48,13 @@ LLExternalEditor::EErrorCode LLExternalEditor::setCommand(const std::string& env // FIRE-10320 If no editor is set, fallback on the system open handler //return EC_NOT_SPECIFIED; llwarns << "Falling back on generic open handler" << llendl; -#ifdef WIN32 - cmd = "%comspec% /C START \"%s\""; -#endif -#ifdef DARWIN - cmd = "/usr/bin/open \"%s\""; -#endif -#ifdef LINUX +#if LL_WINDOWS + std::string comspec(getenv("COMSPEC")); + comspec.append(" /C START \"%s\""); + cmd = findCommand("", comspec); +#elif LL_DARWIN + cmd = findCommand("", "/usr/bin/open \"%s\""); +#elif LL_LINUX // xdg-open might not actually be installed, but it's out best shot cmd = findCommand("", "/usr/bin/xdg-open \"%s\""); #endif