summaryrefslogtreecommitdiff
path: root/indra/llprimitive/llprimitive.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2007-03-07 02:48:44 +0000
committerSteven Bennetts <steve@lindenlab.com>2007-03-07 02:48:44 +0000
commit068558f888446691ebbb3df2105948e0d50300a5 (patch)
tree5224e0fa3e627bc9018af9660198ef15b19c5487 /indra/llprimitive/llprimitive.cpp
parentc4059553afa289f51f9966b4283b2a62b7103303 (diff)
merge release@58791 vc8@58828 -> release
Adds Dev Studio 2005 (VC8) Reviewed by Rob
Diffstat (limited to 'indra/llprimitive/llprimitive.cpp')
-rw-r--r--indra/llprimitive/llprimitive.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index 1b96ac16d4..058c3b5d65 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -1178,7 +1178,7 @@ S32 LLPrimitive::packTEField(U8 *cur_ptr, U8 *data_ptr, U8 data_size, U8 last_fa
{
if (!memcmp(data_ptr+(data_size *face_index), data_ptr+(data_size *i), data_size))
{
- exception_faces |= (1 << i);
+ exception_faces |= ((U64)1 << i);
}
}