diff options
author | Kitty Barnett <develop@catznip.com> | 2012-02-24 16:12:43 +0100 |
---|---|---|
committer | Kitty Barnett <develop@catznip.com> | 2012-02-24 16:12:43 +0100 |
commit | e0d1ddab212103ba11a72783ce3b0a26ea8c0c55 (patch) | |
tree | 44011ae0491941af0bfc1957d5f3b408c81123a4 /indra/newview/llvosurfacepatch.cpp | |
parent | e615660823e680e824d2db0f1a59917597e64a13 (diff) | |
parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) |
Merge with viewer-development
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; |