summaryrefslogtreecommitdiff
path: root/indra/llui/llbutton.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2014-06-16 16:41:52 -0400
committerMonty Brandenberg <monty@lindenlab.com>2014-06-16 16:41:52 -0400
commit903729d5c97c9f93daf463e155055653b92f8fe4 (patch)
tree178e5b9e774702c046f3e7d279ef5b9ef8fc4d1b /indra/llui/llbutton.cpp
parentf3a037f8ad520b7b070fdd057ce2d0b012121efd (diff)
parent977476171ddcc057d7c28b6c14ae988b8189ed75 (diff)
Merge. Refresh from viewer-release after 3.7.9 release.
Diffstat (limited to 'indra/llui/llbutton.cpp')
-rwxr-xr-xindra/llui/llbutton.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 093d91d44d..ce8383857c 100755
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -384,7 +384,7 @@ BOOL LLButton::postBuild()
{
autoResize();
- addBadgeToParentPanel();
+ addBadgeToParentHolder();
return LLUICtrl::postBuild();
}