diff options
author | McCabe Maxsted | 2009-10-01 06:28:19 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-10-01 06:28:19 -0700 |
commit | 62e07b369b0722b3cb2579befbcb6573c14cdcdd (patch) | |
tree | 1e64e2657f764c9c2a015a70d8c1a6d67afc722a | |
parent | Fixed inability to teleport to adult regions in Imprudence 1.2 (Ugly. Only us... (diff) | |
download | meta-impy-62e07b369b0722b3cb2579befbcb6573c14cdcdd.zip meta-impy-62e07b369b0722b3cb2579befbcb6573c14cdcdd.tar.gz meta-impy-62e07b369b0722b3cb2579befbcb6573c14cdcdd.tar.bz2 meta-impy-62e07b369b0722b3cb2579befbcb6573c14cdcdd.tar.xz |
Fixed switched Buy and Create locations in object pie menu (regression)
-rw-r--r-- | ChangeLog.txt | 5 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index a248155..597c595 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,5 +1,10 @@ | |||
1 | 2009-10-01 McCabe Maxsted <hakushakukun@gmail.com> | 1 | 2009-10-01 McCabe Maxsted <hakushakukun@gmail.com> |
2 | 2 | ||
3 | * Fixed switched Buy and Create locations in object pie menu (regression). | ||
4 | |||
5 | modified: linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml | ||
6 | |||
7 | |||
3 | * Fixed inability to teleport to adult regions in Imprudence 1.2. | 8 | * Fixed inability to teleport to adult regions in Imprudence 1.2. |
4 | (Ugly. Only use on 1.22 code base) | 9 | (Ugly. Only use on 1.22 code base) |
5 | 10 | ||
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 2c7ca3c..b1d16a2 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,10 +4,10 @@ | |||
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" /> |
13 | <on_enable function="Object.EnableTouch" userdata="Touch" /> | 13 | <on_enable function="Object.EnableTouch" userdata="Touch" /> |
@@ -75,10 +75,10 @@ | |||
75 | <on_enable function="Tools.EnableUnlink" /> | 75 | <on_enable function="Tools.EnableUnlink" /> |
76 | </menu_item_call> | 76 | </menu_item_call> |
77 | </pie_menu> | 77 | </pie_menu> |
78 | <menu_item_call enabled="false" label="Buy..." mouse_opaque="true" name="Buy..."> | 78 | <menu_item_call enabled="false" label="Create" mouse_opaque="true" name="Create"> |
79 | <on_click function="Object.Buy" /> | 79 | <on_click function="Object.Build" /> |
80 | <on_enable function="Object.EnableBuy" /> | 80 | <on_enable function="EnableEdit" /> |
81 | </menu_item_call> | 81 | </menu_item_call> |
82 | </pie_menu> | 82 | </pie_menu> |
83 | <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit..."> | 83 | <menu_item_call enabled="false" label="Edit..." mouse_opaque="true" name="Edit..."> |
84 | <on_click function="Object.Edit" /> | 84 | <on_click function="Object.Edit" /> |