summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-01 19:52:45 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-01 19:52:45 -0400
commita1741be7f6e4d67be55d6a5bc628c38390f9d4b4 (patch)
tree5c02bd701c5e55cfcf9fbe8af34cb2ae4b2c9995 /indra/newview/pipeline.cpp
parent9be4e7e448769cb82dc7d82e93bee4f1cd2b3e6c (diff)
parent3a2383dc0dc33ccbcddd63e3c0083cedb39f0dcd (diff)
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index c6bbfb1c8f..890839e6e6 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -114,6 +114,7 @@
#include "llpathfindingpathtool.h"
#include "llscenemonitor.h"
#include "llprogressview.h"
+#include "llcleanup.h"
#ifdef _DEBUG
// Debug indices is disabled for now for debug performance - djs 4/24/02
@@ -7385,7 +7386,7 @@ void LLPipeline::doResetVertexBuffers(bool forced)
}
LLVOPartGroup::destroyGL();
- LLVertexBuffer::cleanupClass();
+ SUBSYSTEM_CLEANUP(LLVertexBuffer);
//delete all name pool caches
LLGLNamePool::cleanupPools();