diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-15 17:43:38 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-15 17:43:38 +0200 |
| commit | f41274cae3c8bfe6767ee7dceeb6e3d1563d9695 (patch) | |
| tree | 81c20219c87f23b5f9cce34099cf1db6d68709cd /indra/llplugin/llpluginclassmedia.cpp | |
| parent | 8a8e8e46ee0564ac052c5fecaa1117db19f41c97 (diff) | |
| parent | 234cd6e7c04c0840be6ae4a74eaf138e72876f44 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.cpp')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 6a2449cf4b..d48f4ad0f5 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -65,7 +65,7 @@ LLPluginClassMedia::~LLPluginClassMedia() reset(); } -bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path) +bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::string &plugin_filename, bool debug, const std::string &user_data_path, const std::string &language_code) { LL_DEBUGS("Plugin") << "launcher: " << launcher_filename << LL_ENDL; LL_DEBUGS("Plugin") << "plugin: " << plugin_filename << LL_ENDL; @@ -73,7 +73,7 @@ bool LLPluginClassMedia::init(const std::string &launcher_filename, const std::s mPlugin = new LLPluginProcessParent(this); mPlugin->setSleepTime(mSleepTime); - mPlugin->init(launcher_filename, plugin_filename, debug, user_data_path); + mPlugin->init(launcher_filename, plugin_filename, debug, user_data_path,language_code); return true; } |