diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-02-22 13:29:22 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-02-22 13:29:22 -0700 |
| commit | e216fabde0b23923a3fff5c5edcb6a6a0be10ddd (patch) | |
| tree | e5ebd5c2ee0d74fbdeb778404dbe0964da5ef910 /indra/newview/llviewerwindow.cpp | |
| parent | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (diff) | |
| parent | 2ebcf802cbec59b4d9fe404af5bd125818d4eefa (diff) | |
Automated merge with http://hg.secondlife.com/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 274dbe2cc8..0028ced6c8 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1477,7 +1477,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()) |