diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-12 16:12:34 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-12 16:12:34 -0800 |
| commit | 8c33d5aeccb6d01ab59777a3b4bb3baaae4af8b4 (patch) | |
| tree | 7324c3b2edfabc6f728791ce055eeef74643b197 /indra/newview | |
| parent | 69efa833f7e21c13b16b72d603405651fe0d0241 (diff) | |
| parent | d5e685306ce100a62db06a36dfef58f3beb22b7a (diff) | |
Merge
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 85efe2724e..64dcd62a6a 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1258,7 +1258,8 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ { LLPluginClassMedia* media_source = new LLPluginClassMedia(owner); media_source->setSize(default_width, default_height); - if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"), user_data_path)) + std::string language_code = LLUI::getLanguage(); + if (media_source->init(launcher_name, plugin_name, gSavedSettings.getBOOL("PluginAttachDebuggerToPlugins"), user_data_path, language_code)) { return media_source; } |