summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-21 06:59:55 -0400
committerOz Linden <oz@lindenlab.com>2011-03-21 06:59:55 -0400
commitcb47ae3264f3d9d22add17f2cbc5699c8620705f (patch)
treec426adad23154cb74711a78174c412ab2a2b8034 /indra/llplugin
parent2cddf137e3c785dc9efbe7e12b90d239d8eaa958 (diff)
parent8e0ea2fb7271b6d559ec751d47eb8b2992d4611d (diff)
merge changes for storm-971
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;