From f827ace710fb7398bbc14e03fd5ed06ca67e4d25 Mon Sep 17 00:00:00 2001
From: Northspring <pantera.polnocy@phoenixviewer.com>
Date: Sat, 8 Feb 2014 03:47:23 +0100
Subject: [PATCH] FIRE-12854: Include a Description column in the Inspect
 Objects floater; Changing floater's default dateformat from "Wkday M D H:m:s
 Y" to "Y M D, H:m:s, Wkday" for easier sorting by creation date

---
 indra/newview/llfloaterinspect.cpp               |  5 +++++
 .../skins/default/xui/en/floater_inspect.xml     | 16 ++++++++++------
 .../skins/default/xui/pl/floater_inspect.xml     |  1 +
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llfloaterinspect.cpp b/indra/newview/llfloaterinspect.cpp
index 57534f421a..ad80658bd6 100755
--- a/indra/newview/llfloaterinspect.cpp
+++ b/indra/newview/llfloaterinspect.cpp
@@ -306,6 +306,11 @@ void LLFloaterInspect::refresh()
 		row["columns"][3]["column"] = "creation_date";
 		row["columns"][3]["type"] = "text";
 		row["columns"][3]["value"] = timeStr;
+		// <FS:PP> FIRE-12854: Include a Description column in the Inspect Objects floater
+		row["columns"][4]["column"] = "description";
+		row["columns"][4]["type"] = "text";
+		row["columns"][4]["value"] = obj->mDescription;
+		// </FS:PP>
 		mObjectList->addElement(row, ADD_TOP);
 	}
 	if(selected_index > -1 && mObjectList->getItemIndex(selected_uuid) == selected_index)
diff --git a/indra/newview/skins/default/xui/en/floater_inspect.xml b/indra/newview/skins/default/xui/en/floater_inspect.xml
index ba93e39635..ac0f76acbe 100755
--- a/indra/newview/skins/default/xui/en/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/en/floater_inspect.xml
@@ -5,15 +5,15 @@
  height="300"
  layout="topleft"
  min_height="300"
- min_width="400"
+ min_width="600"
  name="inspect"
  help_topic="inspect"
  save_rect="true"
  title="Inspect Objects"
- width="400">
+ width="600">
     <floater.string
      name="timeStamp">
-        [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local]
+        [year,datetime,local] [mth,datetime,local] [day,datetime,local], [hour,datetime,local]:[min,datetime,local]:[second,datetime,local], [wkday,datetime,local]
     </floater.string>
     <scroll_list
      bottom="268"
@@ -27,20 +27,24 @@
      tool_tip="Select an object from this list to highlight it in-world"
      top="20">
         <scroll_list.columns
-         relative_width="0.30"
+         relative_width="0.20"
          label="Object Name"
          name="object_name" />
         <scroll_list.columns
-         relative_width="0.25"
+         relative_width="0.20"
          label="Owner Name"
          name="owner_name" />
         <scroll_list.columns
-         relative_width="0.25"
+         relative_width="0.20"
          label="Creator Name"
          name="creator_name" />
         <scroll_list.columns
          label="Creation Date"
          name="creation_date"
+         relative_width="0.20" />
+        <scroll_list.columns
+         label="Description"
+         name="description"
          relative_width="0.20" />
 		 <scroll_list.commit_callback
 		   function="Inspect.SelectObject" />
diff --git a/indra/newview/skins/default/xui/pl/floater_inspect.xml b/indra/newview/skins/default/xui/pl/floater_inspect.xml
index 5365bdaccd..e448b77656 100755
--- a/indra/newview/skins/default/xui/pl/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/pl/floater_inspect.xml
@@ -5,6 +5,7 @@
 		<scroll_list.columns label="Właściciel" name="owner_name"/>
 		<scroll_list.columns label="Twórca" name="creator_name"/>
 		<scroll_list.columns label="Utworzony" name="creation_date"/>
+		<scroll_list.columns label="Opis" name="description"/>
 	</scroll_list>
 	<button label="Profil Właściciela..." name="button owner" tool_tip="Zobacz profil Właściciela podświetlonego obiektu"/>
 	<button label="Profil Twórcy..." name="button creator" tool_tip="Zobacz profil Twórcy podświetlonego obiektu"/>