diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-06-25 14:30:52 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-06-25 14:30:52 +0300 |
| commit | e94dfafcc7e1e1de270dc62d3db5854500737544 (patch) | |
| tree | 271d844a84e8581baa1fdf1167ddf6963f31fb1e /indra | |
| parent | 5849d0e8f220741053ea6e7d071eaa3db66b4236 (diff) | |
MAINT-427 FIXED Show default (empty) texture if multiple faces with media are selected.
Diffstat (limited to 'indra')
| -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()) |