diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-09-12 06:27:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-09-12 06:27:13 +0000 |
| commit | da94c0eaa2ce2711f0ae26968e87ef3e409126a9 (patch) | |
| tree | e0b23896f17e0a0ea60160b2c7e39331f3cb9668 /indra/newview/llviewermedia.cpp | |
| parent | 642cdd95726755b7c24c7f2b25e2fea8e49b5b9b (diff) | |
QAR-855 Viewer 1.21 RC 2
merge viewer_1-21 94770-96059 -> release
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index f5d822f2e3..ea1ef2a6a6 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -473,6 +473,9 @@ void LLViewerMedia::initBrowser() buildMediaManagerData( init_data ); LLMediaManager::initBrowser( init_data ); delete init_data; + + // We use a custom user agent with viewer version and skin name. + LLViewerMediaImpl::updateBrowserUserAgent(); } ////////////////////////////////////////////////////////////////////////////////////////// @@ -538,9 +541,6 @@ void LLViewerMedia::buildMediaManagerData( LLMediaManagerData* init_data ) init_data->setBrowserProfileName( profile_name ); init_data->setBrowserParentWindow( gViewerWindow->getMediaWindow() ); - // We use a custom user agent with viewer version and skin name. - LLViewerMediaImpl::updateBrowserUserAgent(); - // Users can change skins while client is running, so make sure // we pick up on changes. gSavedSettings.getControl("SkinCurrent")->getSignal()->connect( |