diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-05-22 13:16:37 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-05-22 13:16:37 -0700 |
| commit | 3888de9439c20eb1698e16fb878a47d78cfdf85e (patch) | |
| tree | 1d0b9b739f1429f1387934ce7c6a92cd61f1a857 /indra/newview/llviewermediafocus.cpp | |
| parent | 656967b326c59a3966261cd75e256e3a7a27cc0a (diff) | |
| parent | c70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermediafocus.cpp')
| -rw-r--r-- | indra/newview/llviewermediafocus.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp index 7b4df3d3da..59165c1d71 100644 --- a/indra/newview/llviewermediafocus.cpp +++ b/indra/newview/llviewermediafocus.cpp @@ -82,7 +82,7 @@ void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 fac if (media_impl.notNull() && objectp.notNull()) { bool face_auto_zoom = false; - + mPrevFocusedImplID = LLUUID::null; mFocusedImplID = media_impl->getMediaTextureID(); mFocusedObjectID = objectp->getID(); mFocusedObjectFace = face; @@ -403,6 +403,7 @@ void LLViewerMediaFocus::update() else { // Someone else has focus -- back off. + mPrevFocusedImplID = mFocusedImplID; clearFocus(); } } @@ -602,6 +603,15 @@ bool LLViewerMediaFocus::isZoomed() const return (mMediaControls.get() && mMediaControls.get()->getZoomLevel() != LLPanelPrimMediaControls::ZOOM_NONE); } +bool LLViewerMediaFocus::isZoomedOnMedia(LLUUID media_id) +{ + if (isZoomed()) + { + return (mFocusedImplID == media_id) || (mPrevFocusedImplID == media_id); + } + return false; +} + LLUUID LLViewerMediaFocus::getControlsMediaID() { if(getFocusedMediaImpl()) |