diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-06-22 12:55:19 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-06-22 12:55:19 +0300 |
| commit | 5f432147e373c3223ac06797ecff147d447ed79f (patch) | |
| tree | 942f163ad33ad3997aee3000cae321f5f693ad57 /indra/newview/llviewermediafocus.h | |
| parent | 99d9befb629c97f7c778c8a9ddfb9d0060d54de9 (diff) | |
| parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) | |
Merged lindenlab/viewer-release into default
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; |