diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-02-24 16:21:19 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-02-24 16:21:19 -0700 |
| commit | 3ce756e44cca0cf6f9860871789e348647800e45 (patch) | |
| tree | 4e5985b861790c6829fe8ae1482499e678cd2ef8 /indra/newview/llviewerwindow.cpp | |
| parent | ca52b0bd712483675bb04421fb4ee6881e61a135 (diff) | |
| parent | 3f6208b1768a111e3d3c401b1f2aeac015782920 (diff) | |
Automated merge with http://hg.secondlife.com/mesh-development
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 d5008c12b0..94fb0b7d31 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")); + LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable"), gSavedSettings.getBOOL("RenderVBOMappingDisable")); if (LLFeatureManager::getInstance()->isSafe() || (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion()) |