diff options
| author | Don Kjer <don@lindenlab.com> | 2011-02-22 21:27:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2011-02-22 21:27:47 +0000 |
| commit | 97eb1b9da4fc04d6d0ded92132be6e8d43d5c3ff (patch) | |
| tree | abba08db97a2821151c24910c6fd28f0418ef3d4 /indra/newview/llviewerwindow.cpp | |
| parent | b5e843abb59ac32cb8cd85dc4b1a43f2bb5c22ee (diff) | |
| parent | e216fabde0b23923a3fff5c5edcb6a6a0be10ddd (diff) | |
Merge with viewer-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 2d6fabf611..21e3626bf8 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1478,7 +1478,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()) |