diff options
author | Richard Nelson <none@none> | 2010-07-30 10:07:14 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-07-30 10:07:14 -0700 |
commit | 76a9c1214fd371bdccf11857156d318cd21ae8bd (patch) | |
tree | 829bd18ebb1ec90234973a980979ca92cebe38ff /indra/newview/llpanelblockedlist.cpp | |
parent | 5e32fb5d28921e8adcdade56b97861356c590855 (diff) | |
parent | 566e3969f98c7ac10fe151ba119a78ac5eda2e3c (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelblockedlist.cpp')
-rw-r--r-- | indra/newview/llpanelblockedlist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp index c72f0f8012..d24c2f7f1b 100644 --- a/indra/newview/llpanelblockedlist.cpp +++ b/indra/newview/llpanelblockedlist.cpp @@ -132,7 +132,7 @@ void LLPanelBlockedList::refreshBlockedList() void LLPanelBlockedList::updateButtons() { bool hasSelected = NULL != mBlockedList->getFirstSelected(); - childSetEnabled("Unblock", hasSelected); + getChildView("Unblock")->setEnabled(hasSelected); } @@ -269,7 +269,7 @@ void LLFloaterGetBlockedObjectName::applyBlocking() { if (mGetObjectNameCallback) { - const std::string& text = childGetValue("object_name").asString(); + const std::string& text = getChild<LLUICtrl>("object_name")->getValue().asString(); mGetObjectNameCallback(text); } closeFloater(); |