diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-29 13:10:38 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-29 13:10:38 -0500 |
| commit | 1e9a4924317b8c0c2c8418c8531c9fd1b141b605 (patch) | |
| tree | 8c2ced7589c79fd6862ed68869e33e167ef3a24e /indra | |
| parent | 0d75c5f4a68df5850dff9afbca545a51459dc040 (diff) | |
SH-2276 disable private memory pool management
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 5756ccdcd5..71596d41d3 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -560,8 +560,8 @@ void LLVertexBuffer::initClass(bool use_vbo, bool no_vbo_mapping) sDisableVBOMapping = sEnableVBOs && no_vbo_mapping ; if(!sPrivatePoolp) - { //disable private pool for now -- lots of memory allocations failing for vertex buffers erroneously - //sPrivatePoolp = LLPrivateMemoryPoolManager::getInstance()->newPool(LLPrivateMemoryPool::STATIC) ; + { + sPrivatePoolp = LLPrivateMemoryPoolManager::getInstance()->newPool(LLPrivateMemoryPool::STATIC) ; } } diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 727851b4da..890eb0f0ce 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -5655,7 +5655,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>MemProfiling</key> <map> |