summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-03-13 22:52:53 -0600
committerDave Parks <davep@lindenlab.com>2010-03-13 22:52:53 -0600
commit663147647d270eff17e654cd13be62b18cc6db30 (patch)
treea8ed70b81266927a218df8bd9091881681a37699 /indra/newview/llviewermedia.cpp
parent71d11af31083ced30da7b67a2a63e624c93b44a3 (diff)
parent234cd6e7c04c0840be6ae4a74eaf138e72876f44 (diff)
merge with viewer-2-0
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp3
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;
}