summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertopobjects.cpp
diff options
context:
space:
mode:
authorAnchor Linden <anchor@lindenlab.com>2018-05-21 16:47:42 -0700
committerAnchor Linden <anchor@lindenlab.com>2018-05-21 16:47:42 -0700
commit0fdbe7e34df55ac92302b4af38c42d03454d3bc1 (patch)
tree038c6087299c9096ac7c6606ec45a8339eb0fd72 /indra/newview/llfloatertopobjects.cpp
parent3bf89821d9c9777a0f24d89280bd7a7011a7a3df (diff)
parentc70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff)
Merge
Diffstat (limited to 'indra/newview/llfloatertopobjects.cpp')
-rw-r--r--indra/newview/llfloatertopobjects.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp
index e20360066e..3e6fc3dc0d 100644
--- a/indra/newview/llfloatertopobjects.cpp
+++ b/indra/newview/llfloatertopobjects.cpp
@@ -236,7 +236,7 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
&& have_extended_data)
{
columns[column_num]["column"] = "memory";
- columns[column_num]["value"] = llformat("%0.0f", (script_memory / 1000.f));
+ columns[column_num]["value"] = llformat("%0.0f", (script_memory / 1024.f));
columns[column_num++]["font"] = "SANSSERIF";
columns[column_num]["column"] = "URLs";