diff options
| author | Palmer <palmer@lindenlab.com> | 2009-11-04 17:04:17 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-11-04 17:04:17 -0800 |
| commit | d5cceb9d2f05ba4e19da3cc50ef273aa4dffc453 (patch) | |
| tree | de0a6cf70ec27964f2b08040c9f217114bd49fa4 /indra/newview/llviewermediafocus.cpp | |
| parent | c4817c4e5856577ff56f34ba48e12cef5ee7ab6d (diff) | |
| parent | 71dc13aac99458989776e93c38294f507074fce4 (diff) | |
Almost automated merge
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()) |