diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-23 01:16:12 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-23 01:16:12 +0100 |
| commit | 439273c9c11ec5f3c186fd7d97a28d11419153cd (patch) | |
| tree | f6e4f1566425921d71e40b9628011eb0f5f539f3 /indra/newview/llviewermediafocus.h | |
| parent | 13536bb273b7413aa4461c8eeaf5a6a865f4234d (diff) | |
| parent | 689beff6698fcb8582c44f58bb9896606850b149 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermediafocus.h')
| -rw-r--r-- | indra/newview/llviewermediafocus.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewermediafocus.h b/indra/newview/llviewermediafocus.h index 368c671f84..763a6c1688 100644 --- a/indra/newview/llviewermediafocus.h +++ b/indra/newview/llviewermediafocus.h @@ -83,6 +83,7 @@ public: void focusZoomOnMedia(LLUUID media_id); // Are we zoomed in? bool isZoomed() const; + bool isZoomedOnMedia(LLUUID media_id); void unZoom(); // Return the ID of the media instance the controls are currently attached to (either focus or hover). @@ -104,6 +105,7 @@ private: LLUUID mFocusedObjectID; S32 mFocusedObjectFace; LLUUID mFocusedImplID; + LLUUID mPrevFocusedImplID; LLVector3 mFocusedObjectNormal; LLUUID mHoverObjectID; |