Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[STORM-1949] Add default values for ExternalEditor

Browse Source 
Thankies Cinder~
This commit is contained in:
Inusaito Sayori
2015-01-12 19:00:44 -05:00
parent 844444c33b
commit c6b1763d96
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llexternaleditor.cpp
View File

@@ -41,8 +41,20 @@ LLExternalEditor::EErrorCode LLExternalEditor::setCommand(const std::string& env
std::string cmd = findCommand(env_var, override);
if (cmd.empty())
{
llwarns << "Editor command is empty or not set" << llendl;
return EC_NOT_SPECIFIED;
#if LL_WINDOWS
cmd = getenv("COMSPEC") + std::string(" /C START \"%s\"");
#elif LL_DARWIN
cmd = "/usr/bin/open \"%s\"";
#elif LL_LINUX
// xdg-open might not actually be installed on all distros, but it's our best bet.
cmd = "/usr/bin/xdg-open \"%s\"";
#endif
cmd = findCommand(LLStringUtil::null, cmd);
if (cmd.empty())
{
llwarns << "Failed to find generic open handler." << llendl;
return EC_NOT_SPECIFIED;
}
}
// Add the filename marker if missing.