diff options
| author | Armin Weatherwax | 2011-03-18 16:55:28 +0100 |
|---|---|---|
| committer | Armin Weatherwax | 2011-03-18 17:37:20 +0100 |
| commit | f8e5faa3079218704cfb793917e96a0a7a9ef8b1 (patch) | |
| tree | 79dcced17678a42e1f26c1a1ca1bdb7ec15c35d8 /linden/indra | |
| parent | fix currency in the german status bar button missing (diff) | |
| download | meta-impy-f8e5faa3079218704cfb793917e96a0a7a9ef8b1.zip meta-impy-f8e5faa3079218704cfb793917e96a0a7a9ef8b1.tar.gz meta-impy-f8e5faa3079218704cfb793917e96a0a7a9ef8b1.tar.bz2 meta-impy-f8e5faa3079218704cfb793917e96a0a7a9ef8b1.tar.xz | |
only use vbo if available
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/llviewerwindow.cpp | 2 | ||||
| -rw-r--r-- | linden/indra/newview/pipeline.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp index b4ef3ff..269a3d0 100644 --- a/linden/indra/newview/llviewerwindow.cpp +++ b/linden/indra/newview/llviewerwindow.cpp | |||
| @@ -1309,7 +1309,7 @@ LLViewerWindow::LLViewerWindow( | |||
| 1309 | { | 1309 | { |
| 1310 | gSavedSettings.setBOOL("RenderVBOEnable", FALSE); | 1310 | gSavedSettings.setBOOL("RenderVBOEnable", FALSE); |
| 1311 | } | 1311 | } |
| 1312 | LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable")); | 1312 | LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable") && gGLManager.mHasVertexBufferObject); |
| 1313 | 1313 | ||
| 1314 | if (LLFeatureManager::getInstance()->isSafe() | 1314 | if (LLFeatureManager::getInstance()->isSafe() |
| 1315 | || (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion()) | 1315 | || (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion()) |
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp index 36ffb05..5458af5 100644 --- a/linden/indra/newview/pipeline.cpp +++ b/linden/indra/newview/pipeline.cpp | |||
| @@ -4934,7 +4934,7 @@ void LLPipeline::setUseVBO(BOOL use_vbo) | |||
| 4934 | } | 4934 | } |
| 4935 | 4935 | ||
| 4936 | resetVertexBuffers(); | 4936 | resetVertexBuffers(); |
| 4937 | LLVertexBuffer::initClass(use_vbo); | 4937 | LLVertexBuffer::initClass(use_vbo && gGLManager.mHasVertexBufferObject); |
| 4938 | } | 4938 | } |
| 4939 | } | 4939 | } |
| 4940 | 4940 | ||