diff options
author | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-08-26 21:45:20 -0700 |
commit | dbe965eaa1864ff71e365608488a5015172a24ed (patch) | |
tree | f3a7f10360a50a09ca1267fd204802507b079a17 /indra/newview/llfloateropenobject.cpp | |
parent | 6ed18227535e1b76ae650efdacfb14c1a884fc1a (diff) | |
parent | 838c01e87d69a29f39554fbc5fa972ddd3baace1 (diff) |
Sync with viewer-development
Diffstat (limited to 'indra/newview/llfloateropenobject.cpp')
-rw-r--r-- | indra/newview/llfloateropenobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp index 8e92a20bc1..d6f6ba9e5b 100644 --- a/indra/newview/llfloateropenobject.cpp +++ b/indra/newview/llfloateropenobject.cpp @@ -69,7 +69,7 @@ LLFloaterOpenObject::~LLFloaterOpenObject() // virtual BOOL LLFloaterOpenObject::postBuild() { - childSetTextArg("object_name", "[DESC]", std::string("Object") ); // *Note: probably do not want to translate this + getChild<LLUICtrl>("object_name")->setTextArg("[DESC]", std::string("Object") ); // *Note: probably do not want to translate this mPanelInventoryObject = getChild<LLPanelObjectInventory>("object_contents"); refresh(); @@ -113,9 +113,9 @@ void LLFloaterOpenObject::refresh() enabled = FALSE; } - childSetTextArg("object_name", "[DESC]", name); - childSetEnabled("copy_to_inventory_button", enabled); - childSetEnabled("copy_and_wear_button", enabled); + getChild<LLUICtrl>("object_name")->setTextArg("[DESC]", name); + getChildView("copy_to_inventory_button")->setEnabled(enabled); + getChildView("copy_and_wear_button")->setEnabled(enabled); } |