diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-01-09 22:44:44 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-01-09 22:44:44 -0700 |
| commit | cda5666dc765c4988b4f01ab34b8a008039ae261 (patch) | |
| tree | 06c00e15896998d373810465d8eb161358dcb340 /indra/newview/llappviewer.cpp | |
| parent | 27bec2b2f21f19a7c04707b03f83c8caa855872d (diff) | |
| parent | 7cc37d949e9319a5b60641ff8453a0fed763d817 (diff) | |
Automated merge with https://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 7 |
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; |