summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2022-03-23 09:38:54 -0700
committerCosmic Linden <cosmic@lindenlab.com>2022-04-05 11:55:34 -0700
commitd4cadd53d49b47c56ab3ff5bbfab6f2baf5a4631 (patch)
tree959058c3e0d10a4e86edd2c8ec820a16bd9bda9a /indra
parentbd87a5b94254e6a827de2298989c0116a81efdc3 (diff)
SL-17058: Remove redundant minimap frustum color, hopefully fixing mac build.
So THAT's why the frustum transparency was different when rotating...
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llnetmap.cpp1
-rw-r--r--indra/newview/skins/default/colors.xml3
2 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp
index 1559ed401d..5cae3ce8d6 100755
--- a/indra/newview/llnetmap.cpp
+++ b/indra/newview/llnetmap.cpp
@@ -171,7 +171,6 @@ void LLNetMap::draw()
static LLUIColor map_track_color = LLUIColorTable::instance().getColor("MapTrackColor", LLColor4::white);
//static LLUIColor map_track_disabled_color = LLUIColorTable::instance().getColor("MapTrackDisabledColor", LLColor4::white);
static LLUIColor map_frustum_color = LLUIColorTable::instance().getColor("MapFrustumColor", LLColor4::white);
- static LLUIColor map_frustum_rotating_color = LLUIColorTable::instance().getColor("MapFrustumRotatingColor", LLColor4::white);
static LLUIColor map_parcel_outline_color = LLUIColorTable::instance().getColor("MapParcelOutlineColor", LLColor4(LLColor3(LLColor4::yellow), 0.5f));
if (mObjectImagep.isNull())
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 82e1942aa5..ad2bc075c6 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -517,9 +517,6 @@
name="MapParcelOutlineColor"
value="1 1 0 0.5" />
<color
- name="MapFrustumRotatingColor"
- value="1 1 1 0.2" />
- <color
name="MapTrackColor"
reference="Red" />
<color