diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2012-02-06 14:52:11 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2012-02-06 14:52:11 -0500 |
| commit | 041f1c1b03e2eee5d08c2b37883ebf5d5f9671df (patch) | |
| tree | 497c21c74f6aec3d2377d801324a6e6a2ea796fe /indra/newview/llvosurfacepatch.cpp | |
| parent | d0da897b24c41983db5a848eced8e71520d85a1b (diff) | |
| parent | 54bc900c952b964206d484aa0b92e42238819fc6 (diff) | |
merge
Diffstat (limited to 'indra/newview/llvosurfacepatch.cpp')
| -rw-r--r-- | indra/newview/llvosurfacepatch.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvosurfacepatch.cpp b/indra/newview/llvosurfacepatch.cpp index c3a2e6a712..bf6158eeaf 100644 --- a/indra/newview/llvosurfacepatch.cpp +++ b/indra/newview/llvosurfacepatch.cpp @@ -65,7 +65,7 @@ public: return; } - U8* base = useVBOs() ? (U8*) mAlignedOffset : mMappedData; + volatile U8* base = useVBOs() ? (U8*) mAlignedOffset : mMappedData; //assume tex coords 2 and 3 are present U32 type_mask = mTypeMask | MAP_TEXCOORD2 | MAP_TEXCOORD3; |