summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2013-10-29 13:20:18 +0000
committerDon Kjer <don@lindenlab.com>2013-10-29 13:20:18 +0000
commit7866356d7719413b952787a509ebd3c4ce8d39b1 (patch)
treea200c96afd5ab8ad6da64c14ec6211aac9d5c65f /indra/llui/llbutton.cpp
parent81fecfa9f7e8664ec4f3bcf6662fe34d4e5d41a1 (diff)
parentea1e1b0925b386cf83178539b8eae9e25c573548 (diff)
Merge viewer-release => sunshine-internal
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rwxr-xr-xindra/llui/llbutton.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 44f2c1efe9..50ac511d18 100755
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -49,6 +49,7 @@
#include "lluictrlfactory.h"
#include "llhelp.h"
#include "lldockablefloater.h"
+#include "llviewereventrecorder.h"
static LLDefaultChildRegistry::Register<LLButton> r("button");
@@ -443,6 +444,8 @@ BOOL LLButton::handleMouseDown(S32 x, S32 y, MASK mask)
*/
LLUICtrl::handleMouseDown(x, y, mask);
+ LLViewerEventRecorder::instance().updateMouseEventInfo(x,y,-55,-55,getPathname());
+
if(mMouseDownSignal) (*mMouseDownSignal)(this, LLSD());
mMouseDownTimer.start();
@@ -473,6 +476,7 @@ BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask)
* by calling LLUICtrl::mMouseUpSignal(x, y, mask);
*/
LLUICtrl::handleMouseUp(x, y, mask);
+ LLViewerEventRecorder::instance().updateMouseEventInfo(x,y,-55,-55,getPathname());
// Regardless of where mouseup occurs, handle callback
if(mMouseUpSignal) (*mMouseUpSignal)(this, LLSD());