diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-02-12 21:59:51 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-02-12 21:59:51 -0500 |
| commit | 6da3f0907cea3748adb6be9a7c393835109adf3b (patch) | |
| tree | 8a569f192a49913db7365c97548c1227a123127e /indra/newview/llexternaleditor.h | |
| parent | 8804fa524c084edb9f49f4122e2c7330a80c79b5 (diff) | |
| parent | 90a1b67cc43792e1ca0047eaca51530aa14e134c (diff) | |
Automated merge with ssh://hg.lindenlab.com/nat/viewer-new-apr
Diffstat (limited to 'indra/newview/llexternaleditor.h')
| -rw-r--r-- | indra/newview/llexternaleditor.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llexternaleditor.h b/indra/newview/llexternaleditor.h index ef5db56c6e..fd2c25020c 100644 --- a/indra/newview/llexternaleditor.h +++ b/indra/newview/llexternaleditor.h @@ -27,7 +27,7 @@ #ifndef LL_LLEXTERNALEDITOR_H #define LL_LLEXTERNALEDITOR_H -#include <llprocesslauncher.h> +#include "llprocess.h" /** * Usage: @@ -97,9 +97,7 @@ private: */ static const std::string sSetting; - - std::string mArgs; - LLProcessLauncher mProcess; + LLProcess::Params mProcessParams; }; #endif // LL_LLEXTERNALEDITOR_H |