diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-23 12:50:17 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-23 12:50:17 -0500 |
| commit | 9b50def44f8b6a477d54ae72891d4d1b1225e247 (patch) | |
| tree | df2e012ae6869ed381f6e3835b61e9cc6b9b2554 /indra/newview/llviewerwindow.cpp | |
| parent | d46594bf714cd19ebcbf693463c4d39e4c771bb8 (diff) | |
| parent | e216fabde0b23923a3fff5c5edcb6a6a0be10ddd (diff) | |
Automated merge up from viewer-development into 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()) |