diff options
| author | prep <prep@lindenlab.com> | 2012-01-19 14:38:16 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2012-01-19 14:38:16 -0500 |
| commit | e2ef5a5edce6a01724d91fde5b471b0bae18d045 (patch) | |
| tree | b5b0bb9796cd893aad8ce3ca329dfcb11026b035 /indra/newview | |
| parent | e683c48e466c264642dc42997327410fb6ebae7f (diff) | |
Path-196 : vbo cleanup, visual fixes (path-222)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 31081e32de..314bd790dd 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1517,9 +1517,9 @@ if (WINDOWS) PROPERTIES # *TODO -reenable this once we get server usage sorted out #LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:\"__tcmalloc\"" - LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:__tcmalloc" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" - LINK_FLAGS_RELEASE "" + LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:__tcmalloc /FORCE:MULTIPLE" + LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO /FORCE:MULTIPLE" + LINK_FLAGS_RELEASE "/FORCE:MULTIPLE" ) if(USE_PRECOMPILED_HEADERS) set_target_properties( diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 7511208ae5..f90c525f11 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,7 +6213,11 @@ void LLPipeline::resetVertexBuffers() gSky.resetVertexBuffers();
- LLVertexBuffer::cleanupClass();
+ if ( LLPathingLib::getInstance() )
+ {
+ LLPathingLib::getInstance()->cleanupVBOManger();
+ }
+ LLVertexBuffer::cleanupClass();
//delete all name pool caches
LLGLNamePool::cleanupPools();
|