diff options
| author | McCabe Maxsted | 2011-03-19 14:13:21 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2011-03-19 14:13:21 -0700 |
| commit | cb6f3e50bc2e99a439ca87177e49778aec7b9723 (patch) | |
| tree | a8b7c0e630018985463933dba7d6a67c4b4eaa27 /linden/indra/newview/pipeline.cpp | |
| parent | Added a null check for corrupt volume lists (diff) | |
| parent | less misleading wording for linux script messages (diff) | |
| download | meta-impy-cb6f3e50bc2e99a439ca87177e49778aec7b9723.zip meta-impy-cb6f3e50bc2e99a439ca87177e49778aec7b9723.tar.gz meta-impy-cb6f3e50bc2e99a439ca87177e49778aec7b9723.tar.bz2 meta-impy-cb6f3e50bc2e99a439ca87177e49778aec7b9723.tar.xz | |
Merge remote-tracking branch 'armin/exp' into exp
Diffstat (limited to 'linden/indra/newview/pipeline.cpp')
| -rw-r--r-- | linden/indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||