summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-01-10 00:12:57 -0800
committerRichard Linden <none@none>2013-01-10 00:12:57 -0800
commite28007f830a85b94adb7b787f18047780ac026ff (patch)
tree2f72c0a29dadea66d95ac7ac6646b93311b85a9c /indra/newview/llappviewer.cpp
parent8c73ff245cee8da2ca75c5651be88a36358a5dae (diff)
parentbeb431c7834f49d8e6b5304f7b60fb1f1b3b4afe (diff)
Automated merge with file:///d:%5Ccode%5Cviewer-interesting-metrics
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 86a241fa58..3d7770c765 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -3749,7 +3749,7 @@ U32 LLAppViewer::getObjectCacheVersion()
{
// Viewer object cache version, change if object update
// format changes. JC
- const U32 INDRA_OBJECT_CACHE_VERSION = 14;
+ const U32 INDRA_OBJECT_CACHE_VERSION = 15;
return INDRA_OBJECT_CACHE_VERSION;
}
@@ -4333,11 +4333,6 @@ void LLAppViewer::idle()
llinfos << "Dead object updates: " << gObjectList.mNumDeadObjectUpdates << llendl;
gObjectList.mNumDeadObjectUpdates = 0;
}
- if (gObjectList.mNumUnknownKills)
- {
- llinfos << "Kills on unknown objects: " << gObjectList.mNumUnknownKills << llendl;
- gObjectList.mNumUnknownKills = 0;
- }
if (gObjectList.mNumUnknownUpdates)
{
llinfos << "Unknown object updates: " << gObjectList.mNumUnknownUpdates << llendl;