diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-02-16 18:24:03 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-02-16 18:24:03 -0500 |
| commit | 75f7aca1079468eb8655c5726318cc3a7aa85c16 (patch) | |
| tree | cabf8ba08a2cb0b1da360798c0937e840bf42590 /indra/llplugin/llpluginprocesschild.cpp | |
| parent | 8af932de1f006d518ddfcf44c8cc2cab344dc802 (diff) | |
| parent | bf7801aeec041fd162599b1b394780ef0e32fe9c (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") { |