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

1 files changed, 10 insertions, 1 deletions

diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index f6d5e27..f759e15 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -534,6 +534,8 @@ public:
         LLViewerJoint mRoot; // avatar skeleton
         BOOL mIsSitting; // sitting state
 
+        static bool updateClientTags();
+        static bool loadClientTags();
         //--------------------------------------------------------------------
         // Private member variables.
         //--------------------------------------------------------------------
@@ -590,12 +592,19 @@ private:
         
         // Animation timer
         LLTimer         mAnimTimer;
-        F32                     mTimeLast;      
+        F32                     mTimeLast;
+
 
         // Send selection beam info to scripts
         static int              sPartsNow;
         static LLVector3d sBeamLastAt;
+        static LLSD sClientResolutionList;
+
+        static void resolveClient(LLColor4& avatar_name_color, std::string& client, LLVOAvatar* avatar);
+//Imprudence FIXME
+//      friend class LLFloaterAvatarList;
 
+protected:
         LLPointer<LLHUDEffectSpiral> mBeam;
         LLFrameTimer mBeamTimer;