aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-04-19 16:46:30 -0700
committerMcCabe Maxsted2011-04-19 16:46:30 -0700
commite7ab172b762bbbb87ca78889fdaecfda39a71233 (patch)
treedd60b2481b33454d0d7eaddd195f41fd5b7f261d /linden/indra/newview/llvoavatar.cpp
parentFixed bug in moving reset prefs to the main prefs window (didn't show the not... (diff)
downloadmeta-impy-e7ab172b762bbbb87ca78889fdaecfda39a71233.zip
meta-impy-e7ab172b762bbbb87ca78889fdaecfda39a71233.tar.gz
meta-impy-e7ab172b762bbbb87ca78889fdaecfda39a71233.tar.bz2
meta-impy-e7ab172b762bbbb87ca78889fdaecfda39a71233.tar.xz
Added custom nametag coloring for Imprudence tags (local only)
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llvoavatar.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index c0ddac5..9c6d646 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3243,7 +3243,8 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
3243 3243
3244 if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf")) 3244 if(idx == LLUUID("cc7a030f-282f-c165-44d2-b5ee572e72bf"))
3245 { 3245 {
3246 avatar_name_color = LLColor4(0.79f,0.44f,0.88f);//Imprudence 3246 // defaults to LLColor4(0.79f,0.44f,0.88f)
3247 avatar_name_color = gSavedSettings.getColor4("ImprudenceTagColor"); //Imprudence
3247 client = "Imprudence"; 3248 client = "Imprudence";
3248 3249
3249 }else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") || 3250 }else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") ||
@@ -3567,7 +3568,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
3567 else 3568 else
3568 { 3569 {
3569 // Set your own name to the Imprudence color -- MC 3570 // Set your own name to the Imprudence color -- MC
3570 client_color = LLColor4(0.79f,0.44f,0.88f); 3571 client_color = gSavedSettings.getColor4("ImprudenceTagColor");
3571 } 3572 }
3572 3573
3573 static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true); 3574 static BOOL* sShowClientColor = rebind_llcontrol<BOOL>("ShowClientColor", &gSavedSettings, true);