From 23ab8d114f3038b8425613cd0c74adb160d0bf2f Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 22 Nov 2008 13:16:39 -0700
Subject: Friends dots show as yellow and color can be set in colors.xml

---
 linden/indra/newview/llcolorscheme.cpp | 5 +----
 linden/indra/newview/llcolorscheme.h   | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'linden/indra')

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 @@
 
 LLColor4 gTrackColor;
 LLColor4 gSelfMapColor;
-LLColor4 gAvatarMapColor;
-LLColor4 gFriendMapColor;
 LLColor4 gLandmarkMapColor;
 LLColor4 gLocationMapColor;
 LLColor4 gTelehubMapColor;
@@ -56,8 +54,7 @@ void init_colors()
 	gDisabledTrackColor.setVec(		0.5f, 0.f, 0.f, 1.f );
 
 	gSelfMapColor     = LLColor4::white;
-	gAvatarMapColor   = LLColor4::green;
-	gFriendMapColor   = LLColor4::yellow;
+
 	// fleshy color
 	//gAvatarMapColor.setVec( 255.f/255.f, 223.f/255.f, 170.f/255.f, 1.f);
 
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 @@
 
 extern LLColor4 gTrackColor;
 extern LLColor4 gSelfMapColor;
-extern LLColor4 gAvatarMapColor;
-extern LLColor4 gFriendMapColor;
 extern LLColor4 gLandmarkMapColor;
 extern LLColor4 gLocationMapColor;
 extern LLColor4 gTelehubMapColor;
-- 
cgit v1.1