summaryrefslogtreecommitdiff
path: root/indra/newview/llexternaleditor.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-05-09 22:33:04 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-05-09 22:33:04 -0400
commita5b0147df4c489b90b3e281ea93b595431094478 (patch)
tree0671efae966a304126d1d0329137be22acfe6447 /indra/newview/llexternaleditor.h
parentd6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff)
parentd29f920c22ca67b13f42680c432b689b80909f42 (diff)
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/newview/llexternaleditor.h')
-rw-r--r--indra/newview/llexternaleditor.h6
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