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

Merge remote-tracking branch 'Liru/master'

Browse Source
This commit is contained in:
Damian Zhaoying
2013-09-30 21:42:46 -03:00
parent 4f863689a9 77d52d0435
commit db2fb32dd8
32 changed files with 2389 additions and 1995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,31 @@
<on_click function="MiniMap.Rotate" userdata="" />
<on_check function="MiniMap.CheckRotate" userdata="" />
</menu_item_check>
<menu_item_check bottom_delta="-18" enabled="false" height="18" label="Show Objects"
left="0" mouse_opaque="true" name="Show Objects" width="128">
<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">
@@ -41,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" />

2
indra/newview/skins/default/xui/en-us/panel_login.xml
View File

@@ -53,7 +53,7 @@
left="0" mouse_opaque="true" name="grids_combo_text" v_pad="0" width="120">
Grid:
</text>
<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|bottom" height="20"
<combo_box allow_text_entry="true" max_chars="128" bottom_delta="-24" follows="left|bottom" height="20"
left="0" mouse_opaque="true" name="grids_combo" width="120" />
<button name="grids_btn" label="Grid Manager"
bottom_delta="-20" left_delta="10" height="16" width="100"

2
indra/newview/skins/default/xui/pt/panel_login.xml
View File

@@ -17,7 +17,7 @@
<text name="grids_combo_text">
Grelha:
</text>
<!--<button name="grids_btn" label="Administrar Grid"/>-->
<button name="grids_btn" label="Administrar Grid"/>
</layout_panel>
<layout_panel name="location_panel">
<text name="start_location_text">