From 6fff70222b60674f0e3cc531e402afb9e7c184e3 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 5 Oct 2018 18:05:36 +0300
Subject: SL-9818 [EEP] Single click on Cloud Scroll number input field doesn't
select it
---
indra/llui/llxyvector.cpp | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
(limited to 'indra/llui/llxyvector.cpp')
diff --git a/indra/llui/llxyvector.cpp b/indra/llui/llxyvector.cpp
index 48f38b8a92..9d5823e368 100644
--- a/indra/llui/llxyvector.cpp
+++ b/indra/llui/llxyvector.cpp
@@ -289,7 +289,14 @@ BOOL LLXYVector::handleMouseUp(S32 x, S32 y, MASK mask)
make_ui_sound("UISndClickRelease");
}
- return TRUE;
+ if (mTouchArea->getRect().pointInRect(x, y))
+ {
+ return TRUE;
+ }
+ else
+ {
+ return LLUICtrl::handleMouseUp(x, y, mask);
+ }
}
BOOL LLXYVector::handleMouseDown(S32 x, S32 y, MASK mask)
@@ -299,8 +306,12 @@ BOOL LLXYVector::handleMouseDown(S32 x, S32 y, MASK mask)
{
gFocusMgr.setMouseCapture(this);
make_ui_sound("UISndClick");
- }
- return TRUE;
+ return TRUE;
+ }
+ else
+ {
+ return LLUICtrl::handleMouseDown(x, y, mask);
+ }
}
--
cgit v1.2.3