diff options
author | Alain Linden <alain@lindenlab.com> | 2011-03-03 13:56:43 -0800 |
---|---|---|
committer | Alain Linden <alain@lindenlab.com> | 2011-03-03 13:56:43 -0800 |
commit | ba1d1267fe2214198b36b5ed130a9a4ae5c5fb3f (patch) | |
tree | 5e647d28eaeed51872ff9ca65536aeb2ce90535a /indra/llplugin/llpluginprocesschild.cpp | |
parent | 0d93ce2e4a3daabc8d653290e39b67e5cddabb14 (diff) | |
parent | d0ed06ffcae08a11ee8b5ff35692b25b5cbbb48a (diff) |
Automated merge with https://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") { |