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; + // 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; + // 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"> - [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] + 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 @@ +