aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default
diff options
context:
space:
mode:
authorunknown2008-12-22 10:34:37 -0700
committerunknown2008-12-22 10:34:37 -0700
commitba793d2be3a63d89dd8a5842322b754da803ac18 (patch)
tree4aee07f8a86912fb321500289a475c62fea757f6 /linden/indra/newview/skins/default
parentresolved merge conflicts (diff)
downloadmeta-impy-ba793d2be3a63d89dd8a5842322b754da803ac18.zip
meta-impy-ba793d2be3a63d89dd8a5842322b754da803ac18.tar.gz
meta-impy-ba793d2be3a63d89dd8a5842322b754da803ac18.tar.bz2
meta-impy-ba793d2be3a63d89dd8a5842322b754da803ac18.tar.xz
Buy and Take now separated in the pie menu.
Diffstat (limited to 'linden/indra/newview/skins/default')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml16
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml6
2 files changed, 11 insertions, 11 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
index df9b2a0..e471115 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
@@ -4,9 +4,9 @@
4 <on_click function="Object.Open" /> 4 <on_click function="Object.Open" />
5 <on_enable function="Object.EnableOpen" /> 5 <on_enable function="Object.EnableOpen" />
6 </menu_item_call> 6 </menu_item_call>
7 <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create"> 7 <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy...">
8 <on_click function="Object.Build" /> 8 <on_click function="Object.Buy" />
9 <on_enable function="EnableEdit" /> 9 <on_enable function="Object.EnableBuy" />
10 </menu_item_call> 10 </menu_item_call>
11 <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch"> 11 <menu_item_call enabled="false" label="Touch" mouse_opaque="true" name="Object Touch">
12 <on_click function="Object.Touch" /> 12 <on_click function="Object.Touch" />
@@ -17,8 +17,8 @@
17 <on_enable function="Object.EnableSitOrStand" userdata="Sit Here,Stand Up" /> 17 <on_enable function="Object.EnableSitOrStand" userdata="Sit Here,Stand Up" />
18 </menu_item_call> 18 </menu_item_call>
19 <menu_item_call enabled="false" label="Take" mouse_opaque="true" name="Pie Object Take"> 19 <menu_item_call enabled="false" label="Take" mouse_opaque="true" name="Pie Object Take">
20 <on_click function="Tools.BuyOrTake" /> 20 <on_click function="Tools.Take" />
21 <on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" /> 21 <on_enable function="Tools.EnableTake" />
22 </menu_item_call> 22 </menu_item_call>
23 <menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay..."> 23 <menu_item_call enabled="false" label="Pay..." mouse_opaque="true" name="Pay...">
24 <on_click function="PayObject" /> 24 <on_click function="PayObject" />
@@ -63,9 +63,9 @@
63 <on_enable function="Object.EnableInspect" /> 63 <on_enable function="Object.EnableInspect" />
64 </menu_item_call> 64 </menu_item_call>
65 </pie_menu> 65 </pie_menu>
66 <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy..."> 66 <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create">
67 <on_click function="Object.Buy" /> 67 <on_click function="Object.Build" />
68 <on_enable function="Object.EnableBuy" /> 68 <on_enable function="EnableEdit" />
69 </menu_item_call> 69 </menu_item_call>
70 </pie_menu> 70 </pie_menu>
71 <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit..."> 71 <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit...">
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 682acb9..48f59de 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
@@ -696,9 +696,9 @@
696 <on_enable function="Tools.SomethingSelectedNoHUD" /> 696 <on_enable function="Tools.SomethingSelectedNoHUD" />
697 </menu_item_call> 697 </menu_item_call>
698 <menu_item_call name="Menu Object Take" enabled="false" 698 <menu_item_call name="Menu Object Take" enabled="false"
699 label="Buy Object" visible="false"> 699 label="Take" visible="false">
700 <on_click function="Tools.BuyOrTake" userdata="" /> 700 <on_click function="Tools.Take" userdata="" />
701 <on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" /> 701 <on_enable function="Tools.EnableTake" />
702 </menu_item_call> 702 </menu_item_call>
703 <menu_item_call name="Take Copy" enabled="false" 703 <menu_item_call name="Take Copy" enabled="false"
704 label="Take Copy"> 704 label="Take Copy">