livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge changes for STORM-2031

master
Oz Linden 2014-08-06 16:18:45 -04:00
parent 7062026da4 4fffc8c8e4
commit 7ede86c97a
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/contributions.txt
View File

@ -713,6 +713,7 @@ Jonathan Yap
STORM-1986
STORM-1981
STORM-2015
STORM-2031
STORM-2030
STORM-2034
STORM-2018

4
indra/newview/llfloatertopobjects.cpp
View File

@ -208,7 +208,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
columns[column_num++]["font"] = "SANSSERIF";
columns[column_num]["column"] = "location";
columns[column_num]["value"] = llformat("<%0.1f,%0.1f,%0.1f>", location_x, location_y, location_z);
columns[column_num]["value"] = llformat("<%0.f, %0.f, %0.f>", location_x, location_y, location_z);
columns[column_num++]["font"] = "SANSSERIF";
columns[column_num]["column"] = "parcel";
@ -258,6 +258,8 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
format.setArg("[COUNT]", llformat("%d", total_count));
format.setArg("[TIME]", llformat("%0.3f", mtotalScore));
getChild<LLUICtrl>("title_text")->setValue(LLSD(format));
list->setColumnLabel("URLs", getString("URLs"));
list->setColumnLabel("memory", getString("memory"));
}
else
{

14
indra/newview/skins/default/xui/en/floater_top_objects.xml
View File

@ -38,6 +38,18 @@
name="none_descriptor">
None found.
</floater.string>
<floater.string
name="URLs">
URLs
</floater.string>
<floater.string
name="memory">
Memory (KB)
</floater.string>
<text
type="string"
length="1"
@ -82,7 +94,7 @@
name="parcel"
width="120" />
<scroll_list.columns
label="Time"
label="Date"
name="time"
width="130" />
<scroll_list.columns