diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-03 15:32:54 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-03 15:32:54 +0200 |
| commit | 4a3eeda1ea5b555d15758dd7abee9b11c980e5b3 (patch) | |
| tree | 400016fada68cf72c5bd64bd1e972ecdf100f530 /indra/newview/llviewermediafocus.cpp | |
| parent | 645e2588511ff55b773e22fe3c9ee2c4de37843c (diff) | |
| parent | eff50b018c93f7ddf328c750ddbea11f0a50f9c1 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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()) |