diff options
| author | Aaron Terrell (Enus) <enus@lindenlab.com> | 2010-08-30 11:56:33 -0700 |
|---|---|---|
| committer | Aaron Terrell (Enus) <enus@lindenlab.com> | 2010-08-30 11:56:33 -0700 |
| commit | d04e8d757575dbb50877ef861adcfde427837bb6 (patch) | |
| tree | b214237a4246e523754b356b003d1d2a163f21ab /indra/newview/llpreview.cpp | |
| parent | 3172b4db1ee4d2059d2605ce616bdb10c840fc03 (diff) | |
| parent | d84c6625c707b5d61b71749b74f3cc4fb8f02048 (diff) | |
merging up from viewer-development
Diffstat (limited to 'indra/newview/llpreview.cpp')
| -rw-r--r-- | indra/newview/llpreview.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index 4f3a2a4044..69542764d2 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -143,12 +143,12 @@ void LLPreview::onCommit() } LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item); - new_item->setDescription(childGetText("desc")); + new_item->setDescription(getChild<LLUICtrl>("desc")->getValue().asString()); - std::string new_name = childGetText("name"); + std::string new_name = getChild<LLUICtrl>("name")->getValue().asString(); if ( (new_item->getName() != new_name) && !new_name.empty()) { - new_item->rename(childGetText("name")); + new_item->rename(getChild<LLUICtrl>("name")->getValue().asString()); } if(mObjectUUID.notNull()) @@ -180,7 +180,7 @@ void LLPreview::onCommit() { LLSelectMgr::getInstance()->deselectAll(); LLSelectMgr::getInstance()->addAsIndividual( obj, SELECT_ALL_TES, FALSE ); - LLSelectMgr::getInstance()->selectionSetObjectDescription( childGetText("desc") ); + LLSelectMgr::getInstance()->selectionSetObjectDescription( getChild<LLUICtrl>("desc")->getValue().asString() ); LLSelectMgr::getInstance()->deselectAll(); } @@ -226,10 +226,10 @@ void LLPreview::refreshFromItem() LLUIString title = getString("Title", args); setTitle(title.getString()); } - childSetText("desc",item->getDescription()); + getChild<LLUICtrl>("desc")->setValue(item->getDescription()); BOOL can_agent_manipulate = item->getPermissions().allowModifyBy(gAgent.getID()); - childSetEnabled("desc",can_agent_manipulate); + getChildView("desc")->setEnabled(can_agent_manipulate); } // static |