diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-03 14:52:05 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-03 14:52:05 -0500 |
| commit | e87975284e2b50c81d95bbb9672678ae262288be (patch) | |
| tree | c081cf1087ac2aa055d0e69737f936138578a2c4 /indra/newview/llviewermediafocus.cpp | |
| parent | 0dd9871012f50d6201217a79b65bedd28368efae (diff) | |
| parent | 3f8c129a1f4caefcc25c895a6612aaaaa0c6aaa3 (diff) | |
update from viewer2 and merge into avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llviewermediafocus.cpp')
| -rw-r--r-- | indra/newview/llviewermediafocus.cpp | 3 |
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()) |