diff options
| author | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-03-12 04:40:51 -0700 |
|---|---|---|
| committer | Graham Madarasz (Graham Linden) <graham@lindenlab.com> | 2013-03-12 04:40:51 -0700 |
| commit | 35383790fb250532fa7701638d39a8f1c6a0cf76 (patch) | |
| tree | 7b75e77faca2cc9ce0ca1d0b1bf022f9f4f85d0e /indra/llrender/llvertexbuffer.cpp | |
| parent | 6613d80d72931b13cc008c3dcc8ee90a39bec8f5 (diff) | |
Merge pragma warning hack to fix linux build
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 1d257d8415..c6f1d76653 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -310,7 +310,7 @@ void LLVBOPool::cleanup() if (r.mClientData) { - ll_aligned_free_16((void*) r.mClientData); + ll_aligned_free((void*) r.mClientData); } l.pop_front(); |