summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsys.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-06-03 18:06:45 -0400
committerOz Linden <oz@lindenlab.com>2013-06-03 18:06:45 -0400
commit9acabccdde5cff91cac3bae0502c8ff5b26cada6 (patch)
treeb6fc95044fc41cdc43969195f9c1939e8ecb0158 /indra/llcommon/llsys.cpp
parentdd2ede9991a9a31821fbe43a7fa17a5aafa19542 (diff)
parent7fa8c2313b47959ba8c0a40d92461f6892e0d0d3 (diff)
merge changes for 3.6.0-materials-beta1
Diffstat (limited to 'indra/llcommon/llsys.cpp')
-rwxr-xr-xindra/llcommon/llsys.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp
index 57a6de9060..b8e8125e68 100755
--- a/indra/llcommon/llsys.cpp
+++ b/indra/llcommon/llsys.cpp
@@ -1032,9 +1032,9 @@ LLMemoryInfo& LLMemoryInfo::refresh()
{
mStatsMap = loadStatsMap();
- LL_DEBUGS("LLMemoryInfo") << "Populated mStatsMap:\n";
- LLSDSerialize::toPrettyXML(mStatsMap, LL_CONT);
- LL_ENDL;
+// LL_DEBUGS("LLMemoryInfo") << "Populated mStatsMap:\n";
+// LLSDSerialize::toPrettyXML(mStatsMap, LL_CONT);
+// LL_ENDL;
return *this;
}