diff options
author | Richard Linden <none@none> | 2011-11-28 23:15:03 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2011-11-28 23:15:03 -0800 |
commit | acd047b6be30bd1537aa62616ed70b02af7405b3 (patch) | |
tree | c4a505cb6349927f37e45ab66584886ad20e5170 /indra/llui/llbutton.cpp | |
parent | a16bc265da9229bebc7ced7aeccdf56693b88a80 (diff) | |
parent | 700277e00aa83506808f2128705143d7ae4937bd (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rw-r--r-- | indra/llui/llbutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index f9e2ad8554..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 ), |