summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermediafocus.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2020-06-24 15:43:42 +0100
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2020-06-24 15:43:42 +0100
commit028f5bfec4c05ad3547771c37921d77b3e6ca875 (patch)
treeeacb91313d189818862f5eb689667611497fda1e /indra/newview/llviewermediafocus.h
parentedddd1b7660c2c155f86fcfddcbff3d32d03e7da (diff)
parentc0087286e78098ee246ea821aefb5686ab8bda78 (diff)
merge
Diffstat (limited to 'indra/newview/llviewermediafocus.h')
-rw-r--r--indra/newview/llviewermediafocus.h6
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();