diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-02-10 15:58:08 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-02-10 15:58:08 -0500 |
| commit | 711d70bd4c2a69c5176759f8bcd2ab0b3e1d1715 (patch) | |
| tree | 488e783c98321b8d3eb7e4c5ec7ca28f0cd5ea02 /indra/llplugin/llpluginprocesschild.cpp | |
| parent | 49b8f8af026a627db47c9592fc92eccda790401e (diff) | |
| parent | e3ed1565f8c6eeff5d87f862465038aa98576fa9 (diff) | |
merge
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") { |