diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-16 12:33:25 -0700 |
| commit | 60c4621500e478d66a8bdc3a1c80573be2860fee (patch) | |
| tree | fa10b52caf3a54e03502058cd52d77952370cb34 /indra/llplugin/llpluginclassmedia.cpp | |
| parent | 2e525711cd08d5f1dce991d1b6595a8dd41c9e3b (diff) | |
| parent | ba414d500ca8cb88da530c89ba373c95195ce633 (diff) | |
Automated merge from viewer/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; } |