diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-02-23 16:24:47 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-02-23 16:24:47 -0500 |
commit | 3d77dd6b5806bededd6b71402f71b9f0675c27c7 (patch) | |
tree | 5bc5fe4f3ecd3076b6b10742be252b2ff5df4a63 /indra/newview/llviewerwindow.cpp | |
parent | 701b665ee567c8ff639fbc4b8794b9b0912a5256 (diff) |
Merge: Backed out changes for STORM-336 for merge due to complexity, will need to apply these manually.
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r-- | indra/newview/llviewerwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 94fb0b7d31..d5008c12b0 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1552,7 +1552,7 @@ LLViewerWindow::LLViewerWindow( { gSavedSettings.setBOOL("RenderVBOEnable", FALSE); } - LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable"), gSavedSettings.getBOOL("RenderVBOMappingDisable")); + LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable")); if (LLFeatureManager::getInstance()->isSafe() || (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion()) |