diff options
| author | Jonathan Yap <none@none> | 2014-05-13 12:30:29 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2014-05-13 12:30:29 -0400 |
| commit | 4fffc8c8e458ed13993fd0d5bc07ff641cb56005 (patch) | |
| tree | 5e479278ef83a590d1fad36f529a980235101894 /indra/newview/llfloatertopobjects.cpp | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
STORM-2031 Display issues with Top colliders/Top scripts floater
OPEN-217 Change to media_plugin_quicktime.cpp causes Windows compile to fail
Diffstat (limited to 'indra/newview/llfloatertopobjects.cpp')
| -rwxr-xr-x | indra/newview/llfloatertopobjects.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp index 7530c72dd2..940fe3733c 100755 --- a/indra/newview/llfloatertopobjects.cpp +++ b/indra/newview/llfloatertopobjects.cpp @@ -207,7 +207,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"; @@ -257,6 +257,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 { |
