diff options
author | simon <none@none> | 2013-10-24 16:45:38 -0700 |
---|---|---|
committer | simon <none@none> | 2013-10-24 16:45:38 -0700 |
commit | 26de32910f99e2522b8e10cf41415b1af2586d5b (patch) | |
tree | 57394ecbec4b9d7bc802e0a68c790f00f2b97887 /indra/llui/llbutton.cpp | |
parent | 93b3f1297ea5377257d14c5214790607e0b1af96 (diff) | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) |
Pull in viewer-release with fbc / snowstorm
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rwxr-xr-x | indra/llui/llbutton.cpp | 4 |
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()); |