diff options
author | Vadim ProductEngine <vsavchuk@productengine.com> | 2010-11-13 00:53:29 +0200 |
---|---|---|
committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2010-11-13 00:53:29 +0200 |
commit | b2fcba25c8dd04318420af30f877b0984a524055 (patch) | |
tree | 7be776f79e5540e9e6b2ad8b7ce507f69cc681a2 /indra/llcommon | |
parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) |
STORM-52 FIXED Made it possible to use an external script editor.
The editor can be specified:
* via "ExternalEditor" setting in settings.xml
* via LL_SCRIPT_EDITOR variable
Removed obsolete XUIEditor setting in favor of the new one.
Diffstat (limited to 'indra/llcommon')
-rw-r--r-- | indra/llcommon/llprocesslauncher.cpp | 5 | ||||
-rw-r--r-- | indra/llcommon/llprocesslauncher.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/llcommon/llprocesslauncher.cpp b/indra/llcommon/llprocesslauncher.cpp index 99308c94e7..81e5f8820d 100644 --- a/indra/llcommon/llprocesslauncher.cpp +++ b/indra/llcommon/llprocesslauncher.cpp @@ -58,6 +58,11 @@ void LLProcessLauncher::setWorkingDirectory(const std::string &dir) mWorkingDir = dir; } +const std::string& LLProcessLauncher::getExecutable() const +{ + return mExecutable; +} + void LLProcessLauncher::clearArguments() { mLaunchArguments.clear(); diff --git a/indra/llcommon/llprocesslauncher.h b/indra/llcommon/llprocesslauncher.h index 479aeb664a..954c249147 100644 --- a/indra/llcommon/llprocesslauncher.h +++ b/indra/llcommon/llprocesslauncher.h @@ -47,6 +47,8 @@ public: void setExecutable(const std::string &executable); void setWorkingDirectory(const std::string &dir); + const std::string& getExecutable() const; + void clearArguments(); void addArgument(const std::string &arg); void addArgument(const char *arg); |