summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermediafocus.h
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-05-27 00:30:52 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2020-05-27 00:30:52 +0300
commita01f29761263314c21dd4905f05124f4c15df502 (patch)
tree72d2b4d6be539ee3eba4eb9e5ff249ac272ac5ee /indra/newview/llviewermediafocus.h
parentad1a46affa3c47ba04a53a5ad625cd3e3693118f (diff)
SL-13148 Implemented wheel support for inworld media
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();