diff options
| author | Jonathan Yap <none@none> | 2011-02-25 20:21:54 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-02-25 20:21:54 -0500 |
| commit | 513fdff9cd8969d7351016902d8304306f739f4e (patch) | |
| tree | a42da46c9be6c89b96cbf02f7125ae009890a787 /indra/newview/llviewerwindow.cpp | |
| parent | eff712570d389d1b7b36153c48b17d906d5eada3 (diff) | |
| parent | 9962560f57eb4bcf1b3451f5d86c963d5d6fcf5c (diff) | |
STORM-990 merge with current v-d & fixed merge conflict
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()) |