diff options
| author | callum_linden <none@none> | 2015-10-20 16:39:00 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-10-20 16:39:00 -0700 |
| commit | 6599e10d00f3a47e90136f5f6cb4b2d1e02cb2e5 (patch) | |
| tree | d48c683923ee978db4dbb0d66cc0d9f45233a68e /indra/newview/llpanelmediasettingsgeneral.cpp | |
| parent | c16e726d0e2a8c607ce441eb5bf2419b16b41cab (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
Merge with tip of viewer-release
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.cpp')
| -rwxr-xr-x | indra/newview/llpanelmediasettingsgeneral.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp index 2856ea9db1..d7c43c224c 100755 --- a/indra/newview/llpanelmediasettingsgeneral.cpp +++ b/indra/newview/llpanelmediasettingsgeneral.cpp @@ -319,6 +319,10 @@ void LLPanelMediaSettingsGeneral::initValues( void* userdata, const LLSD& _media // Helper to set media control to media URL as required void LLPanelMediaSettingsGeneral::updateMediaPreview() { + if(LLTrans::getString("Multiple Media") == mHomeURL->getValue().asString()) + { + return; + } if ( mHomeURL->getValue().asString().length() > 0 ) { if(mPreviewMedia->getCurrentNavUrl() != mHomeURL->getValue().asString()) |