summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermediafocus.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-11-03 17:33:03 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-11-03 17:33:03 +0200
commit506f1787a5e3c98c60e10a00e6197303d28eb03a (patch)
tree9da32a06c41da5e5a56bc49fcb562546a652db02 /indra/newview/llviewermediafocus.cpp
parentf1d834c50d7155102a6482e1c4e4205ddca65be2 (diff)
parentefa9c7a5ba1fa1facaa15d22418e9d4199c3f773 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llviewermediafocus.cpp')
-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())