diff options
author | Ptolemy <ptolemy@lindenlab.com> | 2020-06-29 18:21:11 -0700 |
---|---|---|
committer | Ptolemy <ptolemy@lindenlab.com> | 2020-06-29 18:21:11 -0700 |
commit | 97de9cd465bae1412e38df34a4ab014439948acc (patch) | |
tree | 09ba540ef9a767c3c9f40e0e289adbed310c2ba1 /indra/newview/llviewermediafocus.h | |
parent | 82882d77c41edc3fc3a962ab95ad19fc99604228 (diff) | |
parent | a9471433eb7d0aa28c3a5b248ad34d3df4c096e7 (diff) |
Merge branch 'DRTVWR-497' of bitbucket.org:lindenlab/viewer into DRTVWR-497
Diffstat (limited to 'indra/newview/llviewermediafocus.h')
-rw-r--r-- | indra/newview/llviewermediafocus.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llviewermediafocus.h b/indra/newview/llviewermediafocus.h index 763a6c1688..fa469c36e3 100644 --- a/indra/newview/llviewermediafocus.h +++ b/indra/newview/llviewermediafocus.h @@ -58,7 +58,8 @@ public: /*virtual*/ BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent); /*virtual*/ BOOL handleKeyUp(KEY key, MASK mask, BOOL called_from_parent); /*virtual*/ BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent); - BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); + BOOL handleScrollWheel(const LLVector2& texture_coords, S32 clicks_x, S32 clicks_y); + BOOL handleScrollWheel(S32 x, S32 y, S32 clicks_x, S32 clicks_y); void update(); @@ -67,7 +68,8 @@ public: bool isFocusedOnFace(LLPointer<LLViewerObject> objectp, S32 face); bool isHoveringOverFace(LLPointer<LLViewerObject> objectp, S32 face); - + bool isHoveringOverFocused() { return mFocusedObjectID == mHoverObjectID && mFocusedObjectFace == mHoverObjectFace; }; + // These look up (by uuid) and return the values that were set with setFocusFace. They will return null if the objects have been destroyed. LLViewerMediaImpl* getFocusedMediaImpl(); LLViewerObject* getFocusedObject(); |