diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-05 14:37:06 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-01-05 14:37:06 -0500 |
| commit | bf8e1137012c1e26d570545db1feda77c60aa6ba (patch) | |
| tree | f2a0da29601da94b496c545436c1ef310bc4bed5 /indra/llui/llbutton.cpp | |
| parent | d8aa31d10a89aa826cc549594c083a054a2ad967 (diff) | |
| parent | 7026c80d51128854458f585e50b3b9e3ecab555a (diff) | |
merge
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index 74b8885e1f..93d8282aa7 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -115,7 +115,7 @@ LLButton::Params::Params() LLButton::LLButton(const LLButton::Params& p) : LLUICtrl(p), - LLBadgeOwner(LLView::getHandle()), + LLBadgeOwner(getHandle()), mMouseDownFrame(0), mMouseHeldDownCount(0), mBorderEnabled( FALSE ), @@ -1234,7 +1234,6 @@ void LLButton::resetMouseDownTimer() mMouseDownTimer.reset(); } - BOOL LLButton::handleDoubleClick(S32 x, S32 y, MASK mask) { // just treat a double click as a second click |