summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.h
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-10-15 20:39:40 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-10-15 20:39:40 +0300
commit1f5f9d2e5964a9bcd187f730ee4c3d6a5357df19 (patch)
tree601ed82584cbf6429be302fc034fc704a4e431e8 /indra/newview/llviewermedia.h
parentb964850141f3a749ff7551ebf871756a02d39085 (diff)
parent7a90e71adf230f24c930a97140c19bc26f2bdcc6 (diff)
Downstream merge from lindenlab/viewer-serval
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r--indra/newview/llviewermedia.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 9896399774..b25358ae6c 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -229,7 +229,7 @@ public:
void mouseMove(const LLVector2& texture_coords, MASK mask);
void mouseDoubleClick(const LLVector2& texture_coords, MASK mask);
void mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button = 0);
- void scrollWheel(S32 x, S32 y, S32 scroll_x, S32 scroll_y, MASK mask);
+ void scrollWheel(S32 x, S32 y, MASK mask);
void mouseCapture();
void navigateBack();