diff options
author | Oz Linden <oz@lindenlab.com> | 2011-02-11 11:38:27 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-02-11 11:38:27 -0500 |
commit | 924be3f25c2fca57a8d6f5f902eaeca5c2dd91e1 (patch) | |
tree | 3ba82720ba6b24830637999bfa605e786d814ced /indra/llplugin/llpluginclassmedia.cpp | |
parent | 40abc0fe1e6edd2f018fcdc35ffccdb5475a5fe0 (diff) | |
parent | 547b40bfc8b0139789a2d9c5dcd1591343a2c60b (diff) |
pull back release tag from viewer-beta
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.cpp')
-rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 595c470a19..26a20cede8 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -64,9 +64,10 @@ LLPluginClassMedia::~LLPluginClassMedia() reset(); } -bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug) +bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::string &plugin_dir, const std::string &plugin_filename, bool debug) { LL_DEBUGS("Plugin") << "launcher: " << launcher_filename << LL_ENDL; + LL_DEBUGS("Plugin") << "dir: " << plugin_dir << LL_ENDL; LL_DEBUGS("Plugin") << "plugin: " << plugin_filename << LL_ENDL; mPlugin = new LLPluginProcessParent(this); @@ -77,7 +78,7 @@ bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::s message.setValue("target", mTarget); sendMessage(message); - mPlugin->init(launcher_filename, plugin_filename, debug); + mPlugin->init(launcher_filename, plugin_dir, plugin_filename, debug); return true; } |