diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-11 17:14:25 -0700 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-07-11 17:14:25 -0700 |
| commit | 56d563ba7f8ed4a6284627c36f9c55935b7a9ff2 (patch) | |
| tree | aec7f5064a41c8a7dcb8c6a16aa4b4325521402b /indra/llrender | |
| parent | 173d0fa213f59b872a4a6c34b8668c67b58fdca7 (diff) | |
Fix merge issues - duplicate insertions of code
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index ece794b7f1..739b31204d 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -286,7 +286,6 @@ void LLVBOPool::seedPool() allocate(dummy_name, size, true); } } - } } } |