diff options
| author | McCabe Maxsted | 2010-08-12 12:56:20 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-08-12 12:56:20 -0700 |
| commit | 4db31666d50779f9050e250ad1b56996458388ce (patch) | |
| tree | f0af2495fbe285e7ff58dc77602fa12e4724d9b8 | |
| parent | Port "Derender" pie option from Emerald. All credit due to the Emerald team. (diff) | |
| download | meta-impy-4db31666d50779f9050e250ad1b56996458388ce.zip meta-impy-4db31666d50779f9050e250ad1b56996458388ce.tar.gz meta-impy-4db31666d50779f9050e250ad1b56996458388ce.tar.bz2 meta-impy-4db31666d50779f9050e250ad1b56996458388ce.tar.xz | |
Fixed Derender positions in the pie menu and added them to the legacy pie menu
3 files changed, 9 insertions, 5 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml index 0e5c379..a4d02c0 100644 --- a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml +++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_avatar.xml | |||
| @@ -46,6 +46,9 @@ | |||
| 46 | <on_click function="Object.Inspect" /> | 46 | <on_click function="Object.Inspect" /> |
| 47 | <on_enable function="Object.EnableInspect" /> | 47 | <on_enable function="Object.EnableInspect" /> |
| 48 | </menu_item_call> | 48 | </menu_item_call> |
| 49 | <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender"> | ||
| 50 | <on_click function="Object.DERENDER" /> | ||
| 51 | </menu_item_call> | ||
| 49 | </pie_menu> | 52 | </pie_menu> |
| 50 | <menu_item_call enabled="false" label="Send IM..." mouse_opaque="true" name="Send IM..."> | 53 | <menu_item_call enabled="false" label="Send IM..." mouse_opaque="true" name="Send IM..."> |
| 51 | <on_click function="Avatar.SendIM" /> | 54 | <on_click function="Avatar.SendIM" /> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml index 23591ef..3da3e16 100644 --- a/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml +++ b/linden/indra/newview/skins/default/xui/en-us/legacy_menu_pie_object.xml | |||
| @@ -69,7 +69,9 @@ | |||
| 69 | <on_click function="Object.Mute" /> | 69 | <on_click function="Object.Mute" /> |
| 70 | <on_enable function="Object.EnableMute" /> | 70 | <on_enable function="Object.EnableMute" /> |
| 71 | </menu_item_call> | 71 | </menu_item_call> |
| 72 | <menu_item_separator /> | 72 | <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender"> |
| 73 | <on_click function="Object.DERENDER" /> | ||
| 74 | </menu_item_call> | ||
| 73 | <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect"> | 75 | <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect"> |
| 74 | <on_click function="Object.Inspect" /> | 76 | <on_click function="Object.Inspect" /> |
| 75 | <on_enable function="Object.EnableInspect" /> | 77 | <on_enable function="Object.EnableInspect" /> |
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 1d3ccf6..d02f7f6 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 | |||
| @@ -54,9 +54,6 @@ | |||
| 54 | <on_click function="Object.Mute" /> | 54 | <on_click function="Object.Mute" /> |
| 55 | <on_enable function="Object.EnableMute" /> | 55 | <on_enable function="Object.EnableMute" /> |
| 56 | </menu_item_call> | 56 | </menu_item_call> |
| 57 | <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender"> | ||
| 58 | <on_click function="Object.DERENDER" /> | ||
| 59 | </menu_item_call> | ||
| 60 | <menu_item_call enabled="false" label="Report..." mouse_opaque="true" | 57 | <menu_item_call enabled="false" label="Report..." mouse_opaque="true" |
| 61 | name="Report Abuse..."> | 58 | name="Report Abuse..."> |
| 62 | <on_click function="Object.ReportAbuse" /> | 59 | <on_click function="Object.ReportAbuse" /> |
| @@ -73,7 +70,9 @@ | |||
| 73 | <on_click function="Tools.Link" userdata="" /> | 70 | <on_click function="Tools.Link" userdata="" /> |
| 74 | <on_enable function="Tools.EnableLink" /> | 71 | <on_enable function="Tools.EnableLink" /> |
| 75 | </menu_item_call> | 72 | </menu_item_call> |
| 76 | <menu_item_separator /> | 73 | <menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender"> |
| 74 | <on_click function="Object.DERENDER" /> | ||
| 75 | </menu_item_call> | ||
| 77 | <menu_item_call name="Unlink" enabled="false" label="Unlink"> | 76 | <menu_item_call name="Unlink" enabled="false" label="Unlink"> |
| 78 | <on_click function="Tools.Unlink" userdata="" /> | 77 | <on_click function="Tools.Unlink" userdata="" /> |
| 79 | <on_enable function="Tools.EnableUnlink" /> | 78 | <on_enable function="Tools.EnableUnlink" /> |