aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorMcCabe Maxsted2008-11-22 13:16:39 -0700
committerMcCabe Maxsted2008-11-22 13:16:39 -0700
commit23ab8d114f3038b8425613cd0c74adb160d0bf2f (patch)
treee5e325d333b0c289539aa108acc0f697df3c4a3f /linden/indra
parentApplied patch to show friends dots as yellow (VWR-3336) (diff)
downloadmeta-impy-23ab8d114f3038b8425613cd0c74adb160d0bf2f.zip
meta-impy-23ab8d114f3038b8425613cd0c74adb160d0bf2f.tar.gz
meta-impy-23ab8d114f3038b8425613cd0c74adb160d0bf2f.tar.bz2
meta-impy-23ab8d114f3038b8425613cd0c74adb160d0bf2f.tar.xz
Friends dots show as yellow and color can be set in colors.xml
Diffstat (limited to 'linden/indra')
-rw-r--r--linden/indra/newview/llcolorscheme.cpp5
-rw-r--r--linden/indra/newview/llcolorscheme.h2
2 files changed, 1 insertions, 6 deletions
diff --git a/linden/indra/newview/llcolorscheme.cpp b/linden/indra/newview/llcolorscheme.cpp
index ef8b4a8..460f1a2 100644
--- a/linden/indra/newview/llcolorscheme.cpp
+++ b/linden/indra/newview/llcolorscheme.cpp
@@ -37,8 +37,6 @@
37 37
38LLColor4 gTrackColor; 38LLColor4 gTrackColor;
39LLColor4 gSelfMapColor; 39LLColor4 gSelfMapColor;
40LLColor4 gAvatarMapColor;
41LLColor4 gFriendMapColor;
42LLColor4 gLandmarkMapColor; 40LLColor4 gLandmarkMapColor;
43LLColor4 gLocationMapColor; 41LLColor4 gLocationMapColor;
44LLColor4 gTelehubMapColor; 42LLColor4 gTelehubMapColor;
@@ -56,8 +54,7 @@ void init_colors()
56 gDisabledTrackColor.setVec( 0.5f, 0.f, 0.f, 1.f ); 54 gDisabledTrackColor.setVec( 0.5f, 0.f, 0.f, 1.f );
57 55
58 gSelfMapColor = LLColor4::white; 56 gSelfMapColor = LLColor4::white;
59 gAvatarMapColor = LLColor4::green; 57
60 gFriendMapColor = LLColor4::yellow;
61 // fleshy color 58 // fleshy color
62 //gAvatarMapColor.setVec( 255.f/255.f, 223.f/255.f, 170.f/255.f, 1.f); 59 //gAvatarMapColor.setVec( 255.f/255.f, 223.f/255.f, 170.f/255.f, 1.f);
63 60
diff --git a/linden/indra/newview/llcolorscheme.h b/linden/indra/newview/llcolorscheme.h
index e772b11..bf1e053 100644
--- a/linden/indra/newview/llcolorscheme.h
+++ b/linden/indra/newview/llcolorscheme.h
@@ -36,8 +36,6 @@
36 36
37extern LLColor4 gTrackColor; 37extern LLColor4 gTrackColor;
38extern LLColor4 gSelfMapColor; 38extern LLColor4 gSelfMapColor;
39extern LLColor4 gAvatarMapColor;
40extern LLColor4 gFriendMapColor;
41extern LLColor4 gLandmarkMapColor; 39extern LLColor4 gLandmarkMapColor;
42extern LLColor4 gLocationMapColor; 40extern LLColor4 gLocationMapColor;
43extern LLColor4 gTelehubMapColor; 41extern LLColor4 gTelehubMapColor;