diff options
| author | Tofu Buzzard <no-email> | 2011-02-10 09:54:55 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-10 09:54:55 -0800 |
| commit | c3d46cf6091ab544c5c8fb4a0246bbb1743ae69c (patch) | |
| tree | e02259d268b707d8ae4541f5673fc925b36cfe72 /indra/llplugin/llpluginprocesschild.cpp | |
| parent | cc6602c0c7fa34d712127cb98b24fcc73641fc19 (diff) | |
| parent | 3738cf241ab547e93c0cd9f0c0250502d93c9092 (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") { |