aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorMcCabe Maxsted2011-06-23 20:47:21 -0700
committerMcCabe Maxsted2011-06-23 20:47:21 -0700
commitc96afda71bd39e69e1b26849ac5e956d0fd97072 (patch)
tree96ae96e4f54e3951759b856bacdd09e740118f5f /linden/indra/newview/skins/default/xui
parentUpdated Imp's easter egg chat commands with the new website urls (diff)
downloadmeta-impy-c96afda71bd39e69e1b26849ac5e956d0fd97072.zip
meta-impy-c96afda71bd39e69e1b26849ac5e956d0fd97072.tar.gz
meta-impy-c96afda71bd39e69e1b26849ac5e956d0fd97072.tar.bz2
meta-impy-c96afda71bd39e69e1b26849ac5e956d0fd97072.tar.xz
Created new window for inworld dice rolling in advanced > UI. Todo: add button for 'rocks fall, everybody dies'
Diffstat (limited to 'linden/indra/newview/skins/default/xui')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_dice.xml15
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml7
2 files changed, 21 insertions, 1 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_dice.xml b/linden/indra/newview/skins/default/xui/en-us/floater_dice.xml
new file mode 100644
index 0000000..4a70c1c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_dice.xml
@@ -0,0 +1,15 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater bottom="-95" can_close="true" can_drag_on_left="false" can_minimize="true"
3 can_resize="false" follows="left|top" mouse_opaque="true" height="95" width="200"
4 name="Roll Dice" title="Roll Dice" rect_control="DiceFloaterRect">
5 <spinner bottom="-37" decimal_digits="0" follows="left|top" height="16"
6 increment="1" initial_val="1" label="Number of dice:" label_width="120" left="10"
7 max_val="512" min_val="1" mouse_opaque="true" name="spin_dice_count"
8 width="170" control_name="DiceLastCount" />
9 <spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="16"
10 increment="1" initial_val="6" label="Number of sides:" label_width="120" left="10"
11 max_val="512" min_val="4" mouse_opaque="true" name="spin_dice_sides"
12 width="170" control_name="DiceLastSides" />
13 <button bottom_delta="-30" follows="right|top" font="SansSerif" halign="center" height="22"
14 label="Roll" left="-85" mouse_opaque="true" name="btn_roll" width="80" />
15</floater> \ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index df1cdf2..efde449 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1609,10 +1609,15 @@
1609 <on_check control="ShowSearchBar" /> 1609 <on_check control="ShowSearchBar" />
1610 </menu_item_check> 1610 </menu_item_check>
1611 1611
1612 <menu_item_call name="Reload Balance" label="Reload [CURRENCY] balance" shortcut="control|alt|B"> 1612 <menu_item_call name="Reload Balance" label="Reload [CURRENCY] balance" shortcut="control|alt|B">
1613 <on_click function="Advanced.ReloadBalance" userdata="" /> 1613 <on_click function="Advanced.ReloadBalance" userdata="" />
1614 </menu_item_call> 1614 </menu_item_call>
1615 1615
1616 <menu_item_check name="Roll Dice"
1617 label="Roll Dice">
1618 <on_click function="Advanced.ToggleDice" userdata="" />
1619 <on_check function="Advanced.CheckDice" userdata="" />
1620 </menu_item_check>
1616 1621
1617 <menu_item_separator /> 1622 <menu_item_separator />
1618 1623