summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorSabrina Shanman <cosmic@lindenlab.com>2022-02-24 21:51:02 +0000
committerSabrina Shanman <cosmic@lindenlab.com>2022-02-24 21:51:02 +0000
commit611869b1035ef5677335a33169fb99413a90c3a6 (patch)
tree855de9547d1bb39a16692383299ae3e6dbb7acde /indra/newview/skins/default
parentf856483c12fc5f08d10766a07305700554398f27 (diff)
parent898079a39bc86598d8e998a24845d0932c88cdca (diff)
Merged in SL-16857 (pull request #876)
SL-16857: Provide parcel border information to the mini-map Approved-by: Andrey Lihatskiy Approved-by: Vir Linden
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/colors.xml3
-rw-r--r--indra/newview/skins/default/xui/en/menu_mini_map.xml10
2 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 7beb013fba..82e1942aa5 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -514,6 +514,9 @@
name="MapFrustumColor"
reference="White_10" />
<color
+ name="MapParcelOutlineColor"
+ value="1 1 0 0.5" />
+ <color
name="MapFrustumRotatingColor"
value="1 1 1 0.2" />
<color
diff --git a/indra/newview/skins/default/xui/en/menu_mini_map.xml b/indra/newview/skins/default/xui/en/menu_mini_map.xml
index ea263d05ce..c3899b35cd 100644
--- a/indra/newview/skins/default/xui/en/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/en/menu_mini_map.xml
@@ -63,6 +63,16 @@
function="Minimap.Tracker"
parameter="task_properties" />
</menu_item_call>
+ <menu_item_separator />
+ <menu_item_check
+ label="Show Property Lines"
+ name="Show Property Lines">
+ <menu_item_check.on_check
+ control="MiniMapShowPropertyLines" />
+ <menu_item_check.on_click
+ function="ToggleControl"
+ parameter="MiniMapShowPropertyLines" />
+ </menu_item_check>
<menu_item_separator />
<menu_item_call
label="World Map"