diff options
author | McCabe Maxsted | 2009-06-09 09:41:04 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-09 09:41:04 -0700 |
commit | e5dbb8e4dc05e664102362685ddca94f37cdf575 (patch) | |
tree | 93e695263553adadc423cf7e7d2e4b046adb8a7a /linden/indra/newview/llcolorscheme.cpp | |
parent | Fixed the Resident Chooser showing hair instead of calling cards (diff) | |
download | meta-impy-e5dbb8e4dc05e664102362685ddca94f37cdf575.zip meta-impy-e5dbb8e4dc05e664102362685ddca94f37cdf575.tar.gz meta-impy-e5dbb8e4dc05e664102362685ddca94f37cdf575.tar.bz2 meta-impy-e5dbb8e4dc05e664102362685ddca94f37cdf575.tar.xz |
Backported 1.23's minimap conversion to XUI
Diffstat (limited to 'linden/indra/newview/llcolorscheme.cpp')
-rw-r--r-- | linden/indra/newview/llcolorscheme.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/linden/indra/newview/llcolorscheme.cpp b/linden/indra/newview/llcolorscheme.cpp index 3b12acf..07c3e75 100644 --- a/linden/indra/newview/llcolorscheme.cpp +++ b/linden/indra/newview/llcolorscheme.cpp | |||
@@ -36,12 +36,9 @@ | |||
36 | #include "llviewercontrol.h" | 36 | #include "llviewercontrol.h" |
37 | 37 | ||
38 | LLColor4 gTrackColor; | 38 | LLColor4 gTrackColor; |
39 | LLColor4 gSelfMapColor; | ||
40 | LLColor4 gLandmarkMapColor; | 39 | LLColor4 gLandmarkMapColor; |
41 | LLColor4 gLocationMapColor; | 40 | LLColor4 gLocationMapColor; |
42 | LLColor4 gTelehubMapColor; | 41 | LLColor4 gTelehubMapColor; |
43 | LLColor4 gFrustumMapColor; | ||
44 | LLColor4 gRotatingFrustumMapColor; | ||
45 | LLColor4 gEventColor; | 42 | LLColor4 gEventColor; |
46 | LLColor4 gPopularColor; | 43 | LLColor4 gPopularColor; |
47 | LLColor4 gPickColor; | 44 | LLColor4 gPickColor; |
@@ -52,17 +49,9 @@ void init_colors() | |||
52 | { | 49 | { |
53 | gTrackColor = LLColor4::red; | 50 | gTrackColor = LLColor4::red; |
54 | gDisabledTrackColor.setVec( 0.5f, 0.f, 0.f, 1.f ); | 51 | gDisabledTrackColor.setVec( 0.5f, 0.f, 0.f, 1.f ); |
55 | |||
56 | gSelfMapColor = LLColor4::white; | ||
57 | |||
58 | // fleshy color | ||
59 | //gAvatarMapColor.setVec( 255.f/255.f, 223.f/255.f, 170.f/255.f, 1.f); | ||
60 | |||
61 | gLandmarkMapColor = LLColor4::red; | 52 | gLandmarkMapColor = LLColor4::red; |
62 | gLocationMapColor.setVec( 0.f, 0.72f, 1.f, 1.f); | 53 | gLocationMapColor.setVec( 0.f, 0.72f, 1.f, 1.f); |
63 | gTelehubMapColor.setVec( 0.9f, 0.9f, 0.f, 1.f); // dk yellow | 54 | gTelehubMapColor.setVec( 0.9f, 0.9f, 0.f, 1.f); // dk yellow |
64 | gFrustumMapColor.setVec( 1.f, 1.f, 1.f, 0.08f); | ||
65 | gRotatingFrustumMapColor.setVec(1.f, 1.f, 1.f, 0.2f); | ||
66 | gEventColor.setVec( 1.f, 0.5f, 1.f, 1.f ); | 55 | gEventColor.setVec( 1.f, 0.5f, 1.f, 1.f ); |
67 | gPopularColor.setVec( 1.f, 0.0f, 0.f, 1.f ); | 56 | gPopularColor.setVec( 1.f, 0.0f, 0.f, 1.f ); |
68 | gPickColor.setVec( 1.f, 0.0f, 0.f, 1.f ); | 57 | gPickColor.setVec( 1.f, 0.0f, 0.f, 1.f ); |