summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2011-03-19 16:29:32 -0400
committerJonathan Yap <none@none>2011-03-19 16:29:32 -0400
commitfbd241da54ad6017825b59c5b0c71086d8b8957a (patch)
tree34051dba97afece2416f25954080011d922d910e /indra/llplugin
parent834d0f1ed612c8644e642103096daf7f0b0f44c9 (diff)
parent1a7369408c0b2cd15dbdc79d045f3347a8ab47d1 (diff)
STORM-1019 Resolve merge conflicts
Diffstat (limited to 'indra/llplugin')
-rw-r--r--indra/llplugin/llpluginprocessparent.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp
index db4b8b1316..315096d4fd 100644
--- a/indra/llplugin/llpluginprocessparent.cpp
+++ b/indra/llplugin/llpluginprocessparent.cpp
@@ -160,6 +160,7 @@ void LLPluginProcessParent::errorState(void)
void LLPluginProcessParent::init(const std::string &launcher_filename, const std::string &plugin_dir, const std::string &plugin_filename, bool debug)
{
mProcess.setExecutable(launcher_filename);
+ mProcess.setWorkingDirectory(plugin_dir);
mPluginFile = plugin_filename;
mPluginDir = plugin_dir;
mCPUUsage = 0.0f;