diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-08-06 16:18:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-08-06 16:18:45 -0400 |
| commit | 7ede86c97a1a6d903c7d2fc1f15a384d1283d866 (patch) | |
| tree | f678de009c1242abf8f94d59e55fde77b0a04e4b | |
| parent | 7062026da4d6cbdeb6a039f0e6ec387586269c65 (diff) | |
| parent | 4fffc8c8e458ed13993fd0d5bc07ff641cb56005 (diff) | |
merge changes for STORM-2031
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llfloatertopobjects.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_top_objects.xml | 14 |
3 files changed, 17 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 3d97ad723c..2e9c1da9a6 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -713,6 +713,7 @@ Jonathan Yap STORM-1986 STORM-1981 STORM-2015 + STORM-2031 STORM-2030 STORM-2034 STORM-2018 diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp index 3a167cfc77..d604b8619a 100755 --- a/indra/newview/llfloatertopobjects.cpp +++ b/indra/newview/llfloatertopobjects.cpp @@ -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 { diff --git a/indra/newview/skins/default/xui/en/floater_top_objects.xml b/indra/newview/skins/default/xui/en/floater_top_objects.xml index 0b71177345..36ceddd305 100755 --- a/indra/newview/skins/default/xui/en/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/en/floater_top_objects.xml @@ -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 |