1 files changed, 44 insertions, 24 deletions

diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 3b62c63..cd90c59 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -685,16 +685,16 @@ S32	LLVOAvatar::sNumVisibleAvatars = 0;
 S32     LLVOAvatar::sNumLODChangesThisFrame = 0;
 LLSD LLVOAvatar::sClientResolutionList;
 
-const LLUUID LLVOAvatar::sStepSoundOnLand = LLUUID("e8af4a28-aa83-4310-a7c4-c047e15ea0df");
+const LLUUID LLVOAvatar::sStepSoundOnLand("e8af4a28-aa83-4310-a7c4-c047e15ea0df");
 const LLUUID LLVOAvatar::sStepSounds[LL_MCODE_END] =
 {
-        LLUUID(SND_STONE_RUBBER),
-        LLUUID(SND_METAL_RUBBER),
-        LLUUID(SND_GLASS_RUBBER),
-        LLUUID(SND_WOOD_RUBBER),
-        LLUUID(SND_FLESH_RUBBER),
-        LLUUID(SND_RUBBER_PLASTIC),
-        LLUUID(SND_RUBBER_RUBBER)
+        SND_STONE_RUBBER,
+        SND_METAL_RUBBER,
+        SND_GLASS_RUBBER,
+        SND_WOOD_RUBBER,
+        SND_FLESH_RUBBER,
+        SND_RUBBER_PLASTIC,
+        SND_RUBBER_RUBBER
 };
 
 S32 LLVOAvatar::sRenderName = RENDER_NAME_ALWAYS;
@@ -3467,13 +3467,19 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
         }
 
         const F32 time_visible = mTimeVisible.getElapsedTimeF32();
-        const F32 NAME_SHOW_TIME = gSavedSettings.getF32("RenderNameShowTime"); // seconds
-        const F32 FADE_DURATION = gSavedSettings.getF32("RenderNameFadeDuration"); // seconds
+
+        static F32* sRenderNameShowTime = rebind_llcontrol<F32>("RenderNameShowTime", &gSavedSettings, true);
+        static F32* sRenderNameFadeDuration = rebind_llcontrol<F32>("RenderNameFadeDuration", &gSavedSettings, true);
+
+
+        const F32 NAME_SHOW_TIME = *sRenderNameShowTime;        // seconds
+        const F32 FADE_DURATION = *sRenderNameFadeDuration; // seconds
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
         bool fRlvShowNames = gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES);
 // [/RLVa:KB]
         BOOL visible_avatar = isVisible() || mNeedsAnimUpdate;
-        BOOL visible_chat = gSavedSettings.getBOOL("UseChatBubbles") && (mChats.size() || mTyping);
+        static BOOL* sUseChatBubbles = rebind_llcontrol<BOOL>("UseChatBubbles", &gSavedSettings, true);
+        BOOL visible_chat = *sUseChatBubbles && (mChats.size() || mTyping);
         BOOL render_name =      visible_chat ||
                                                 (visible_avatar &&
 // [RLVa:KB] - Checked: 2009-08-11 (RLVa-1.0.1h) | Added: RLVa-1.0.0h
@@ -3515,6 +3521,9 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                         mRenderGroupTitles = sRenderGroupTitles;
                         new_name = TRUE;
                 }
+
+                static LLColor4* sAvatarNameColor = rebind_llcontrol<LLColor4>("AvatarNameColor", &gColors, true);
+
                 std::string client;
                 // First Calculate Alpha
                 // If alpha > 0, create mNameText if necessary, otherwise delete it
@@ -3555,7 +3564,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                         new_name = TRUE;
                                 }
                                 
-                                LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" );
+                                LLColor4 avatar_name_color = (*sAvatarNameColor);
                                 LLColor4 client_color = avatar_name_color;
 
                                 if(!mIsSelf) //don't know your own client ?
@@ -3570,11 +3579,14 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                         // Set your own name to the Imprudence color -- MC
                                         client_color = LLColor4(0.79f,0.44f,0.88f);
                                 }
-                                if (gSavedSettings.getBOOL("ShowClientColor"))
+
+                                static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);
+                                static BOOL* sShowClientNameTag = rebind_llcontrol<BOOL>("ShowClientNameTag", &gSavedSettings, true);
+                                if (*sShowClientColor)
                                 {
                                         avatar_name_color = client_color;
                                 }
-                                if (!gSavedSettings.getBOOL("ShowClientNameTag"))
+                                if (!(*sShowClientNameTag))
                                 {
                                         client.clear();
                                 }
@@ -3667,7 +3679,8 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 
                                 BOOL need_comma = FALSE;
 
-                                bool show_client = client.length() != 0 && gSavedSettings.getBOOL("ShowClientNameTag");
+                                static BOOL* sShowClientNameTag = rebind_llcontrol<BOOL>("ShowClientNameTag", &gSavedSettings, true);
+                                bool show_client = client.length() != 0 && (*sShowClientNameTag);
                                 if (is_away || is_muted || is_busy || show_client)
                                 {
                                         line += " (";
@@ -3736,7 +3749,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 std::deque<LLChat>::iterator chat_iter = mChats.begin();
                                 mNameText->clearString();
 
-                                LLColor4 new_chat = gColors.getColor( "AvatarNameColor" );
+                                LLColor4 new_chat = (*sAvatarNameColor);
                                 LLColor4 normal_chat = lerp(new_chat, LLColor4(0.8f, 0.8f, 0.8f, 1.f), 0.7f);
                                 LLColor4 old_chat = lerp(normal_chat, LLColor4(0.6f, 0.6f, 0.6f, 1.f), 0.7f);
                                 if (mTyping && mChats.size() >= MAX_BUBBLE_CHAT_UTTERANCES)
@@ -3798,14 +3811,20 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                         }
                         else
                         {
-                                if (gSavedSettings.getBOOL("SmallAvatarNames"))
+                                S32 style = LLFontGL::NORMAL;
+
+                                if (!mIsSelf && gSavedSettings.getBOOL("HighlightFriends"))
                                 {
-                                        mNameText->setFont(LLFontGL::getFontSansSerif());
+                                        if (is_agent_friend(this->getID())) // Ele: bold for friends
+                                                style |= LLFontGL::BOLD;
                                 }
+
+                                static BOOL* sSmallAvatarNames = rebind_llcontrol<BOOL>("SmallAvatarNames", &gSavedSettings, true);
+                                if (*sSmallAvatarNames)
+                                        mNameText->setFont(LLFontGL::getFont(LLFontDescriptor("SansSerif","Medium",style)));
                                 else
-                                {
-                                        mNameText->setFont(LLFontGL::getFontSansSerifBig());
-                                }
+                                        mNameText->setFont(LLFontGL::getFont(LLFontDescriptor("SansSerif","Large",style)));
+
                                 mNameText->setTextAlignment(LLHUDText::ALIGN_TEXT_CENTER);
                                 mNameText->setFadeDistance(CHAT_NORMAL_RADIUS, 5.f);
                                 mNameText->setVisibleOffScreen(FALSE);
@@ -5133,7 +5152,7 @@ void LLVOAvatar::updateTextures(LLAgent &agent) // KL SD version
                                 if (texture_dict->mIsLocalTexture)
                                 {
                                         addLocalTextureStats((ETextureIndex)index, imagep, texel_area_ratio, render_avatar, layer_baked[baked_index]);
-                                }
+                                        }
                                 else if (texture_dict->mIsBakedTexture)
                                 {
                                         if (layer_baked[baked_index])
@@ -7358,7 +7377,8 @@ BOOL LLVOAvatar::updateIsFullyLoaded()
 
 BOOL LLVOAvatar::isFullyLoaded()
 {
-        if (gSavedSettings.getBOOL("RenderUnloadedAvatar"))
+        static BOOL* sRenderUnloadedAvatar = rebind_llcontrol<BOOL>("RenderUnloadedAvatar", &gSavedSettings, true);
+        if (*sRenderUnloadedAvatar)
                 return TRUE;
         else
                 return mFullyLoaded;
@@ -7685,7 +7705,7 @@ void LLVOAvatar::updateMeshTextures()
                 for (U32 i = 0; i < mBakedTextureData[BAKED_HAIR].mMeshes.size(); i++)
                 {
                         mBakedTextureData[BAKED_HAIR].mMeshes[i]->setColor( 1.f, 1.f, 1.f, 1.f );
-                }
+        }
                 mHasBakedHair = TRUE;
         }