summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-01-19 18:36:21 -0800
committerTodd Stinson <stinson@lindenlab.com>2012-01-19 18:36:21 -0800
commit154ed186eab7f6e57601cf7e08c927f3a860a9d8 (patch)
treec31869ce5e1df43e6dcdd2052db15f4ba36201d7 /indra/newview/pipeline.cpp
parentfe637c5f9571e91c8e90440a0677e5c40b7bf648 (diff)
parentd82ca578941a985fb2361ccdc4120aeeb22f82a7 (diff)
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r--indra/newview/pipeline.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 2681f05a4e..d8c6e61430 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -104,6 +104,7 @@
#include "lltoolpie.h"
#include "llcurl.h"
#include "llnotifications.h"
+#include "llpathinglib.h"
#ifdef _DEBUG
// Debug indices is disabled for now for debug performance - djs 4/24/02
@@ -6212,6 +6213,10 @@ void LLPipeline::resetVertexBuffers()
gSky.resetVertexBuffers();
+ if ( LLPathingLib::getInstance() )
+ {
+ LLPathingLib::getInstance()->cleanupVBOManger();
+ }
LLVertexBuffer::cleanupClass();
//delete all name pool caches