summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2009-11-02 17:58:10 -0800
committerMonroe Linden <monroe@lindenlab.com>2009-11-02 17:58:10 -0800
commit3c1c0d7544805df7d77b7f2af4ab1f83ebf0839c (patch)
treef4abdbfe1e0fca9751a0c596ab9b7e8d9e6998e4 /indra/newview
parent967e171ed67449b9e97c16425df9114e4c7dd48c (diff)
Changed the operation of the "mute all" button in the nearby media floater to be closer to spec-compliant, per a design discussion this afternoon.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewermediafocus.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
index 2f7040aaa3..657c58364f 100644
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -86,6 +86,9 @@ void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 fac
mFocusedObjectID = objectp->getID();
mFocusedObjectFace = face;
mFocusedObjectNormal = pick_normal;
+
+ // Focusing on a media face clears its disable flag.
+ media_impl->setDisabled(false);
LLTextureEntry* tep = objectp->getTE(face);
if(tep->hasMedia())