Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'slb/master'

Browse Source 
Conflicts:
	indra/newview/llnetmap.cpp
	indra/newview/llnetmap.h
	indra/newview/skins/default/xui/en-us/menu_mini_map.xml
This commit is contained in:
Aleric Inglewood
2013-09-29 16:56:55 +02:00
parent ffc44a7010 af1480615f
commit 227c621dad
8 changed files with 253 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/skins/default/xui/en-us/menu_mini_map.xml
View File

@@ -29,6 +29,26 @@
<on_click function="MiniMap.ShowObjects" userdata="" />
<on_check function="MiniMap.CheckShowObjects" userdata="" />
</menu_item_check>
<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
mouse_opaque="false" name="Chat Distance Rings" opaque="true" tear_off="false" width="125">
<menu_item_check label="Show All" name="Show All">
<on_check control="MiniMapChatRings" />
<on_click function="MiniMap.ChatRings" userdata="MiniMapChatRings" />
</menu_item_check>
<menu_item_separator />
<menu_item_check label="Show Whisper Ring" name="Show Whisper Ring">
<on_check control="MiniMapWhisperRing" />
<on_click function="MiniMap.WhisperRing" userdata="MiniMapWhisperRing" />
</menu_item_check>
<menu_item_check label="Show Chat Ring" name="Show Chat Ring">
<on_check control="MiniMapChatRing" />
<on_click function="MiniMap.ChatRing" userdata="MiniMapChatRing" />
</menu_item_check>
<menu_item_check label="Show Shout Ring" name="Show Shout Ring">
<on_check control="MiniMapShoutRing" />
<on_click function="MiniMap.ShoutRing" userdata="MiniMapShoutRing" />
</menu_item_check>
</menu>
<menu_item_separator />
<menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Stop Tracking"
left="0" mouse_opaque="true" name="Stop Tracking" width="128">
@@ -46,9 +66,7 @@
<on_enable function="MiniMap.EnableProfile" />
</menu_item_call>
<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
mouse_opaque="false" name="Mark" opaque="true" tear_off="false"
width="125">
<on_enable function="MiniMap.EnableProfile" />
mouse_opaque="false" name="Mark" opaque="true" tear_off="false" width="125">
<menu_item_call bottom_delta="-18" enabled = "true" height="18" label="Red"
left="0" mouse_opaque="true" name="Red" width="128">
<on_click function="MiniMap.setred" />