aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-12 14:59:33 -0500
committerJacek Antonelli2008-09-12 14:59:39 -0500
commit80a8bab2a9dd8e77262b001af973212a6cba4a5a (patch)
tree170168232fd4e2eec5f15295a9445535969cdb76 /linden/indra/newview/llviewermedia.cpp
parentSecond Life viewer sources 1.21.1-RC (diff)
downloadmeta-impy-80a8bab2a9dd8e77262b001af973212a6cba4a5a.zip
meta-impy-80a8bab2a9dd8e77262b001af973212a6cba4a5a.tar.gz
meta-impy-80a8bab2a9dd8e77262b001af973212a6cba4a5a.tar.bz2
meta-impy-80a8bab2a9dd8e77262b001af973212a6cba4a5a.tar.xz
Second Life viewer sources 1.21.2-RC
Diffstat (limited to 'linden/indra/newview/llviewermedia.cpp')
-rw-r--r--linden/indra/newview/llviewermedia.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index 76c11f1..e99c838 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -473,6 +473,9 @@ void LLViewerMedia::initBrowser()
473 buildMediaManagerData( init_data ); 473 buildMediaManagerData( init_data );
474 LLMediaManager::initBrowser( init_data ); 474 LLMediaManager::initBrowser( init_data );
475 delete init_data; 475 delete init_data;
476
477 // We use a custom user agent with viewer version and skin name.
478 LLViewerMediaImpl::updateBrowserUserAgent();
476} 479}
477 480
478////////////////////////////////////////////////////////////////////////////////////////// 481//////////////////////////////////////////////////////////////////////////////////////////
@@ -538,9 +541,6 @@ void LLViewerMedia::buildMediaManagerData( LLMediaManagerData* init_data )
538 init_data->setBrowserProfileName( profile_name ); 541 init_data->setBrowserProfileName( profile_name );
539 init_data->setBrowserParentWindow( gViewerWindow->getMediaWindow() ); 542 init_data->setBrowserParentWindow( gViewerWindow->getMediaWindow() );
540 543
541 // We use a custom user agent with viewer version and skin name.
542 LLViewerMediaImpl::updateBrowserUserAgent();
543
544 // Users can change skins while client is running, so make sure 544 // Users can change skins while client is running, so make sure
545 // we pick up on changes. 545 // we pick up on changes.
546 gSavedSettings.getControl("SkinCurrent")->getSignal()->connect( 546 gSavedSettings.getControl("SkinCurrent")->getSignal()->connect(