summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertopobjects.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-05-18 03:02:44 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-05-18 03:02:44 +0300
commit64b3473f4920b0340e731e44342e2599ad46d698 (patch)
treee8f9994d427d5dcce6e3a19432f31f5f86f16f46 /indra/newview/llfloatertopobjects.cpp
parent151df9b87b409283d11de7d3b918fd23f9772354 (diff)
parentc70119ebabc4b06e2b0db02aea8c56e01fbc666e (diff)
Merged in lindenlab/viewer-release
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";