diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-03-13 22:52:53 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-03-13 22:52:53 -0600 |
| commit | 663147647d270eff17e654cd13be62b18cc6db30 (patch) | |
| tree | a8ed70b81266927a218df8bd9091881681a37699 /indra/llplugin/llpluginclassmedia.cpp | |
| parent | 71d11af31083ced30da7b67a2a63e624c93b44a3 (diff) | |
| parent | 234cd6e7c04c0840be6ae4a74eaf138e72876f44 (diff) | |
merge with viewer-2-0
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; } |