From 738192c930d8857d11ccbebaf62bffb7c48a8e2e Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 30 Nov 2009 23:38:38 +0100
Subject: Emeralds client name tag and clothing layer protection. Needs
 decision about a few things - find "Imprudence FIXME" (woq) in
 llprimitive.cpp and llvoavatar.cpp, its commented there.

	modified:   linden/indra/llprimitive/llprimitive.cpp
	modified:   linden/indra/llprimitive/llprimitive.h
	modified:   linden/indra/newview/app_settings/settings.xml
	modified:   linden/indra/newview/llagent.cpp
	modified:   linden/indra/newview/llappviewer.cpp
	modified:   linden/indra/newview/llfirstuse.cpp
	modified:   linden/indra/newview/llfirstuse.h
	modified:   linden/indra/newview/llstartup.cpp
	modified:   linden/indra/newview/llvoavatar.cpp
	modified:   linden/indra/newview/llvoavatar.h
	modified:   linden/indra/newview/skins/default/xui/en-us/notifications.xml
---
 linden/indra/llprimitive/llprimitive.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/llprimitive/llprimitive.h')

diff --git a/linden/indra/llprimitive/llprimitive.h b/linden/indra/llprimitive/llprimitive.h
index cc86f5b..cf9ff0f 100644
--- a/linden/indra/llprimitive/llprimitive.h
+++ b/linden/indra/llprimitive/llprimitive.h
@@ -339,7 +339,7 @@ public:
 	void copyTEs(const LLPrimitive *primitive);
 	S32 packTEField(U8 *cur_ptr, U8 *data_ptr, U8 data_size, U8 last_face_index, EMsgVariableType type) const;
 	S32 unpackTEField(U8 *cur_ptr, U8 *buffer_end, U8 *data_ptr, U8 data_size, U8 face_count, EMsgVariableType type);
-	BOOL packTEMessage(LLMessageSystem *mesgsys) const;
+	BOOL packTEMessage(LLMessageSystem *mesgsys, bool shield = false) const;
 	BOOL packTEMessage(LLDataPacker &dp) const;
 	S32 unpackTEMessage(LLMessageSystem *mesgsys, char *block_name);
 	S32 unpackTEMessage(LLMessageSystem *mesgsys, char *block_name, const S32 block_num); // Variable num of blocks
-- 
cgit v1.1