summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2011-02-24 18:28:31 -0800
committerTofu Buzzard <no-email>2011-02-24 18:28:31 -0800
commit1a3255c38c074f27e43fcf31f7def501b286aa43 (patch)
tree0b6a03e314f4c946545b8343ac56ec9f6e1cff93 /indra/newview/llviewerwindow.cpp
parentb73a1dc3a2b9477e5fb6aca4083542793c82e470 (diff)
parent41dc7188ea0b5a1031e82ef8a1b3861107b16216 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp2
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())