Backed out changeset a62bf7c0af21

Backing out this merge that I pushed (prematurely) to the wrong place.

1 files changed, 9 insertions, 9 deletions

diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index a984dd1d51..41869ac62b 100644
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -92,7 +92,7 @@ LLFloaterTopObjects::~LLFloaterTopObjects()
 BOOL LLFloaterTopObjects::postBuild()
 {
 	LLScrollListCtrl *objects_list = getChild<LLScrollListCtrl>("objects_list");
-	getChild<LLUICtrl>("objects_list")->setFocus(TRUE);
+	childSetFocus("objects_list");
 	objects_list->setDoubleClickCallback(onDoubleClickObjectsList, this);
 	objects_list->setCommitOnSelectionChange(TRUE);
 
@@ -247,7 +247,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 		LLUIString format = getString("top_scripts_text");
 		format.setArg("[COUNT]", llformat("%d", total_count));
 		format.setArg("[TIME]", llformat("%0.1f", mtotalScore));
-		getChild<LLUICtrl>("title_text")->setValue(LLSD(format));
+		childSetValue("title_text", LLSD(format));
 	}
 	else
 	{
@@ -256,7 +256,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
 		list->setColumnLabel("mono_time", "");
 		LLUIString format = getString("top_colliders_text");
 		format.setArg("[COUNT]", llformat("%d", total_count));
-		getChild<LLUICtrl>("title_text")->setValue(LLSD(format));
+		childSetValue("title_text", LLSD(format));
 	}
 }
 
@@ -276,13 +276,13 @@ void LLFloaterTopObjects::updateSelectionInfo()
 
 	std::string object_id_string = object_id.asString();
 
-	getChild<LLUICtrl>("id_editor")->setValue(LLSD(object_id_string));
+	childSetValue("id_editor", LLSD(object_id_string));
 	LLScrollListItem* sli = list->getFirstSelected();
 	llassert(sli);
 	if (sli)
 	{
-		getChild<LLUICtrl>("object_name_editor")->setValue(sli->getColumn(1)->getValue().asString());
-		getChild<LLUICtrl>("owner_name_editor")->setValue(sli->getColumn(2)->getValue().asString());
+		childSetValue("object_name_editor", sli->getColumn(1)->getValue().asString());
+		childSetValue("owner_name_editor", sli->getColumn(2)->getValue().asString());
 	}
 }
 
@@ -306,7 +306,7 @@ void LLFloaterTopObjects::doToObjects(int action, bool all)
 	LLViewerRegion* region = gAgent.getRegion();
 	if (!region) return;
 
-	LLCtrlListInterface *list = getChild<LLUICtrl>("objects_list")->getListInterface();
+	LLCtrlListInterface *list = childGetListInterface("objects_list");
 	if (!list || list->getItemCount() == 0) return;
 
 	uuid_vec_t::iterator id_itor;
@@ -451,14 +451,14 @@ void LLFloaterTopObjects::onRefresh()
 void LLFloaterTopObjects::onGetByObjectName()
 {
 	mFlags  = STAT_FILTER_BY_OBJECT;
-	mFilter = getChild<LLUICtrl>("object_name_editor")->getValue().asString();
+	mFilter = childGetText("object_name_editor");
 	onRefresh();
 }
 
 void LLFloaterTopObjects::onGetByOwnerName()
 {
 	mFlags  = STAT_FILTER_BY_OWNER;
-	mFilter = getChild<LLUICtrl>("owner_name_editor")->getValue().asString();
+	mFilter = childGetText("owner_name_editor");
 	onRefresh();
 }