diff options
| author | Don Kjer <don@lindenlab.com> | 2011-02-19 00:17:12 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-02-19 00:17:12 +0000 |
| commit | 8330a4d0fd046834a27a988102b439a6ec1f0aa2 (patch) | |
| tree | 7fd2227522bf5c2377a45124cb50aad0afb90597 /indra/llplugin/llpluginprocesschild.cpp | |
| parent | 3f5760b5ee4e422e11f3416133b7a4c3a73b1d8c (diff) | |
| parent | 18bf5f09b22a2c36ccf543104b1115a7b0b9db71 (diff) | |
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
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") { |