diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-16 21:54:57 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-16 21:54:57 -0500 |
| commit | cd885c0a09903837784dc9393769ba177aea8163 (patch) | |
| tree | ecb272c440c8a709263b4c24d884bf72307e113d /indra/llplugin/llpluginprocesschild.cpp | |
| parent | 008938e37292cc8b66e19f2df3f745e9b178b86d (diff) | |
| parent | 4497502d0d3784a2cfd6871e7609290de2023475 (diff) | |
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/llplugin/llpluginprocesschild.cpp')
| -rw-r--r-- | indra/llplugin/llpluginprocesschild.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp index 45a86476ac..0beb46d0e5 100644 --- a/indra/llplugin/llpluginprocesschild.cpp +++ b/indra/llplugin/llpluginprocesschild.cpp @@ -139,7 +139,7 @@ void LLPluginProcessChild::idle(void) if(!mPluginFile.empty()) { mInstance = new LLPluginInstance(this); - if(mInstance->load(mPluginFile) == 0) + if(mInstance->load(mPluginDir, mPluginFile) == 0) { mHeartbeat.start(); mHeartbeat.setTimerExpirySec(HEARTBEAT_SECONDS); @@ -348,6 +348,7 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) if(message_name == "load_plugin") { mPluginFile = parsed.getValue("file"); + mPluginDir = parsed.getValue("dir"); } else if(message_name == "shm_add") { |