summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-06-26 15:27:34 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-06-26 15:27:34 -0400
commit3f52cefcc4b4cc00caef56a40e0da1ea981a3073 (patch)
tree7697fdea468261e1cd266eed1ba37ecab08c1e16 /indra/newview/pipeline.cpp
parent33c88a1c6037290924691db59c6538a370946ea4 (diff)
parent687efd84eabc524e339e61458b0cbf53f9a38f8a (diff)
MAINT-5232: merge LLError::Log::demangle() to tip
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rwxr-xr-xindra/newview/pipeline.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 03712c1065..9c1b78626f 100755
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -115,6 +115,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
@@ -7373,7 +7374,7 @@ void LLPipeline::doResetVertexBuffers(bool forced)
}
LLVOPartGroup::destroyGL();
- LLVertexBuffer::cleanupClass();
+ SUBSYSTEM_CLEANUP(LLVertexBuffer);
//delete all name pool caches
LLGLNamePool::cleanupPools();