diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-04-13 13:18:54 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-04-13 13:18:54 -0700 |
| commit | 8fa23739a1409d8e93252985d7f5951f518cdb21 (patch) | |
| tree | 10c484f02fe054d8ca8590e1e9f40240fa05bc9a | |
| parent | 6a1677d9e5907b4e34a0e71084a95c1fa138569d (diff) | |
Fix for EXT-6750 (disabled attachment media still plays).
LLViewerMediaImpl::shouldShowBasedOnClass() was always returning true for focused media. This was incorrect, since it made click-focusing on media override the class-based disable preferences.
Reviewed by Callum at http://codereview.lindenlab.com/1178023
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index 0f5a984188..6ff46222ff 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -2985,8 +2985,9 @@ bool LLViewerMediaImpl::shouldShowBasedOnClass() const // " outside = " << (!inside_parcel && gSavedSettings.getBOOL(LLViewerMedia::SHOW_MEDIA_OUTSIDE_PARCEL_SETTING)) << llendl; // If it has focus, we should show it - if (hasFocus()) - return true; + // This is incorrect, and causes EXT-6750 (disabled attachment media still plays) +// if (hasFocus()) +// return true; // If it is attached to an avatar and the pref is off, we shouldn't show it if (attached_to_another_avatar) |