diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-01-19 18:36:21 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-01-19 18:36:21 -0800 |
| commit | 154ed186eab7f6e57601cf7e08c927f3a860a9d8 (patch) | |
| tree | c31869ce5e1df43e6dcdd2052db15f4ba36201d7 /indra/newview | |
| parent | fe637c5f9571e91c8e90440a0677e5c40b7bf648 (diff) | |
| parent | d82ca578941a985fb2361ccdc4120aeeb22f82a7 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/newview/llavatariconctrl.cpp | 0 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
3 files changed, 8 insertions, 3 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/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp index b539ac38ed..b539ac38ed 100755..100644 --- a/indra/newview/llavatariconctrl.cpp +++ b/indra/newview/llavatariconctrl.cpp 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
|