diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-04-14 15:44:10 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-04-14 15:44:10 -0400 |
| commit | 2f90bb65e4794bfb7d2ee3ab0c79f17b5a9e8bf6 (patch) | |
| tree | 7d0ec14acdd8868e967c2fc0fe5983c2a3e7af01 /indra/newview/llviewermedia.cpp | |
| parent | 628b143566b81e6029d9bd35f0dc76b79db9cdf8 (diff) | |
| parent | 53b46e839bb742a05c7d40bdf7bf794d1558c421 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -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) |