summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-21 06:59:13 -0400
committerOz Linden <oz@lindenlab.com>2011-03-21 06:59:13 -0400
commit8e0ea2fb7271b6d559ec751d47eb8b2992d4611d (patch)
tree0368edab036f87a93a21bcd0fdd635dd749d6fc0 /indra/llplugin
parent2453ccbd3ee10a4f845e98fb51aac6c1e4bca5a5 (diff)
parentf122d0939060fd597820a71d85a5c0d839bcff5d (diff)
merge changes for storm-659
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;