summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-11-29 23:54:00 -0800
committerRichard Linden <none@none>2011-11-29 23:54:00 -0800
commit0323a37ac6c55e3ed599f60f4950c49e0e084c4a (patch)
tree5375e3679b21e8e7893bb5b8761ba681f981c68e /indra/llui/llbutton.cpp
parentf2f90b6ed8e493a42aff805135527d6a7a345e3e (diff)
parentff32ef773b19a6d0f7826c7edf7962e2fde492e6 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rw-r--r--indra/llui/llbutton.cpp2
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 ),