summaryrefslogtreecommitdiff
path: root/indra/newview/llexternaleditor.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-25 17:16:29 -0400
committerOz Linden <oz@lindenlab.com>2012-06-25 17:16:29 -0400
commit0f958faacd37461a26af76d34a6b29744a2cd1ec (patch)
tree2233d2143c3529a1ffd3b66ee9db5108abeb77f4 /indra/newview/llexternaleditor.h
parent1b8bbc7b863ccfc25833dcdbbf0dd9e3e96dc0bb (diff)
parenteff9be530805298339f656f86a52ade9efeba779 (diff)
merge up to 3.3.3-release + pathfinding
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