summaryrefslogtreecommitdiff
path: root/indra/newview/llexternaleditor.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-02-07 14:31:27 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-02-07 14:31:27 -0500
commit2681d5403ca0cdf686077d7b14ffa9111f9e9f5d (patch)
tree1de7a70c9cf77417b893cdf8a163de315520a213 /indra/newview/llexternaleditor.h
parent33a42b32ca72031a79edca821966f6ebbdcddc93 (diff)
parent32e11494ffde368b2ac166e16dc294d66a18492f (diff)
Automated merge with file:C%3A%5CUsers%5CNat%5Clinden%5Cviewer-tut-fix
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