diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-02-09 20:18:26 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-02-09 20:18:26 -0800 |
| commit | 76cb9a7796ffce930458aae00147f8dafa4b33fb (patch) | |
| tree | c9553396094aba4608da58662e5383c009423d2e /indra/llplugin/llpluginprocesschild.cpp | |
| parent | b82f2c4e4d8c4b9a349e4cd933dff7a0844019c0 (diff) | |
| parent | 0ea1b472c636415a48b8cc688ec9b7663be6dc9d (diff) | |
STORM-986 : pull into viewer-development
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") { |