[DRTVWR-455] - add new bake testure and tattoo slots

1 files changed, 33 insertions, 20 deletions

diff --git a/indra/llprimitive/llprimitive.cpp b/indra/llprimitive/llprimitive.cpp
index bfa65666b5..6aa6493303 100644
--- a/indra/llprimitive/llprimitive.cpp
+++ b/indra/llprimitive/llprimitive.cpp
@@ -1029,23 +1029,32 @@ S32 LLPrimitive::packTEField(U8 *cur_ptr, U8 *data_ptr, U8 data_size, U8 last_fa
 				}
 			}
 			
-			//assign exception faces to cur_ptr
-			if (exception_faces >= (0x1 << 7))
-			{
-				if (exception_faces >= (0x1 << 14))
-				{
-					if (exception_faces >= (0x1 << 21))
-					{
-						if (exception_faces >= (0x1 << 28))
-						{
-							*cur_ptr++ = (U8)(((exception_faces >> 28) & 0x7F) | 0x80);
-						}
-						*cur_ptr++ = (U8)(((exception_faces >> 21) & 0x7F) | 0x80);
-					}
-					*cur_ptr++ = (U8)(((exception_faces >> 14) & 0x7F) | 0x80);
-				}
-				*cur_ptr++ = (U8)(((exception_faces >> 7) & 0x7F) | 0x80);
-			}
+			//assign exception faces to cur_ptr

+			if (exception_faces >= ((U64)0x1 << 7))

+			{

+				if (exception_faces >= ((U64)0x1 << 14))

+				{

+					if (exception_faces >= ((U64)0x1 << 21))

+					{

+						if (exception_faces >= ((U64)0x1 << 28))

+						{

+							if (exception_faces >= ((U64)0x1 << 35))

+							{

+								if (exception_faces >= ((U64)0x1 << 42))

+								{

+									*cur_ptr++ = (U8)(((exception_faces >> 42) & 0x7F) | 0x80);

+								}

+								*cur_ptr++ = (U8)(((exception_faces >> 35) & 0x7F) | 0x80);

+							}

+							*cur_ptr++ = (U8)(((exception_faces >> 28) & 0x7F) | 0x80);

+						}

+						*cur_ptr++ = (U8)(((exception_faces >> 21) & 0x7F) | 0x80);

+					}

+					*cur_ptr++ = (U8)(((exception_faces >> 14) & 0x7F) | 0x80);

+				}

+				*cur_ptr++ = (U8)(((exception_faces >> 7) & 0x7F) | 0x80);

+			}

+
 			
 			*cur_ptr++ = (U8)(exception_faces & 0x7F);
 			
@@ -1105,7 +1114,7 @@ S32 LLPrimitive::unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 dat
 // Includes information about image ID, color, scale S,T, offset S,T and rotation
 BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys) const
 {
-	const U32 MAX_TES = 32;
+	const U32 MAX_TES = 42;
 
 	U8     image_ids[MAX_TES*16];
 	U8     colors[MAX_TES*4];
@@ -1190,7 +1199,7 @@ BOOL LLPrimitive::packTEMessage(LLMessageSystem *mesgsys) const
 
 BOOL LLPrimitive::packTEMessage(LLDataPacker &dp) const
 {
-	const U32 MAX_TES = 32;
+	const U32 MAX_TES = 42;
 
 	U8     image_ids[MAX_TES*16];
 	U8     colors[MAX_TES*4];
@@ -1303,6 +1312,8 @@ S32 LLPrimitive::parseTEMessage(LLMessageSystem* mesgsys, char const* block_name
 		mesgsys->getBinaryDataFast(block_name, _PREHASH_TextureEntry, tec.packed_buffer, 0, block_num, LLTEContents::MAX_TE_BUFFER);
 	}
 
+	
+
 	tec.face_count = llmin((U32)getNumTEs(),(U32)LLTEContents::MAX_TES);
 
 	U8 *cur_ptr = tec.packed_buffer;
@@ -1375,6 +1386,8 @@ S32 LLPrimitive::applyParsedTEMessage(LLTEContents& tec)
 
 		retval |= setTEColor(i, color);
 
+		
+
 	}
 
 	return retval;
@@ -1393,7 +1406,7 @@ S32 LLPrimitive::unpackTEMessage(LLDataPacker &dp)
 {
 	// use a negative block_num to indicate a single-block read (a non-variable block)
 	S32 retval = 0;
-	const U32 MAX_TES = 32;
+	const U32 MAX_TES = 42;
 
 	// Avoid construction of 32 UUIDs per call
 	static LLUUID image_ids[MAX_TES];