merge skinning-7 -r 119501-119577 -> viewer-2.0.0-1 *NOTE: This overlaps a little with the skinning-7 -> skinning-8 merge of 119500-119692 -- James

ignore-dead-branch

4 files changed, 25 insertions, 15 deletions

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 1de656144f..347fe45b82 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -1462,26 +1462,26 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
 
 		if (is_group_owned)
 		{
-			item_params.cells.add().type("icon").value(self->mIconGroup->getName());
-			item_params.cells.add().value(OWNER_GROUP).font(FONT);
+			item_params.cells.add().type("icon").value(self->mIconGroup->getName()).column("type");
+			item_params.cells.add().value(OWNER_GROUP).font(FONT).column("online_status");
 		}
 		else if (is_online)
 		{
-			item_params.cells.add().type("icon").value(self->mIconAvatarOnline->getName());
-			item_params.cells.add().value(OWNER_ONLINE).font(FONT);
+			item_params.cells.add().type("icon").value(self->mIconAvatarOnline->getName()).column("type");
+			item_params.cells.add().value(OWNER_ONLINE).font(FONT).column("online_status");
 		}
 		else  // offline
 		{
-			item_params.cells.add().type("icon").value(self->mIconAvatarOffline->getName());
-			item_params.cells.add().value(OWNER_OFFLINE).font(FONT);
+			item_params.cells.add().type("icon").value(self->mIconAvatarOffline->getName()).column("type");
+			item_params.cells.add().value(OWNER_OFFLINE).font(FONT).column("online_status");
 		}
 
 		// Placeholder for name.
-		item_params.cells.add().font(FONT);
+		item_params.cells.add().font(FONT).column("name");
 
 		object_count_str = llformat("%d", object_count);
-		item_params.cells.add().value(object_count_str).font(FONT);
-		item_params.cells.add().value(formatted_time((time_t)most_recent_time)).font(FONT);
+		item_params.cells.add().value(object_count_str).font(FONT).column("count");
+		item_params.cells.add().value(formatted_time((time_t)most_recent_time)).font(FONT).column("mostrecent");
 
 		self->mOwnerList->addRow(item_params);
 
diff --git a/indra/newview/llfloaterurlentry.h b/indra/newview/llfloaterurlentry.h
index 6f83c18d07..0aeca823b8 100644
--- a/indra/newview/llfloaterurlentry.h
+++ b/indra/newview/llfloaterurlentry.h
@@ -1,6 +1,6 @@
 /**
- * @file llfloaternamedesc.h
- * @brief LLFloaterNameDesc class definition
+ * @file llfloaterurlentry.h
+ * @brief LLFloaterURLEntry class definition
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
  * 
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index eee64b5651..95d787840f 100644
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -54,7 +54,7 @@ void LLNameListCtrl::NameTypeNames::declareValues()
 }
 
 LLNameListCtrl::Params::Params()
-:	name_column("name_column"),
+:	name_column(""),
 	allow_calling_card_drop("allow_calling_card_drop", false)
 {
 	name = "name_list";
@@ -63,8 +63,8 @@ LLNameListCtrl::Params::Params()
 LLNameListCtrl::LLNameListCtrl(const LLNameListCtrl::Params& p)
 :	LLScrollListCtrl(p),
 	mAllowCallingCardDrop(p.allow_calling_card_drop),
-	mNameColumn(p.name_column),
-	mNameColumnIndex(0)
+	mNameColumn(p.name_column.column_name),
+	mNameColumnIndex(p.name_column.column_index)
 {}
 
 // public
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h
index 759ea938f9..379cd48a6a 100644
--- a/indra/newview/llnamelistctrl.h
+++ b/indra/newview/llnamelistctrl.h
@@ -66,9 +66,19 @@ public:
 		{}		
 	};
 
+	struct NameColumn : public LLInitParam::Choice<NameColumn>
+	{
+		Option<S32>				column_index;
+		Option<std::string>		column_name;
+		NameColumn()
+		:	column_name("name_column"),
+			column_index("name_column_index", 0)
+		{}
+	};
+
 	struct Params : public LLInitParam::Block<Params, LLScrollListCtrl::Params>
 	{
-		Optional<std::string>	name_column;
+		Optional<NameColumn>	name_column;
 		Optional<bool>	allow_calling_card_drop;
 		Params();
 	};