diff options
-rw-r--r-- | ChangeLog.txt | 9 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml | 4 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index cc4e1ae..64786ad 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -16,6 +16,15 @@ | |||
16 | modified: linden/indra/newview/skins/default/html/en-us/loading/loading.html | 16 | modified: linden/indra/newview/skins/default/html/en-us/loading/loading.html |
17 | new file: linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png | 17 | new file: linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png |
18 | 18 | ||
19 | |||
20 | * Cherry-picked Armin's middle mouse copy branch. | ||
21 | * Cherry-picked Armin's double-click tp inworld branch. | ||
22 | |||
23 | |||
24 | * Added 'Go Here' to object pie menu. | ||
25 | |||
26 | modified: linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml | ||
27 | |||
19 | 28 | ||
20 | 2009-09-03 Jacek Antonelli <jacek.antonelli@gmail.com> | 29 | 2009-09-03 Jacek Antonelli <jacek.antonelli@gmail.com> |
21 | 30 | ||
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 8d059c1..765529d 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,7 +54,9 @@ | |||
54 | <on_click function="Object.ReportAbuse" /> | 54 | <on_click function="Object.ReportAbuse" /> |
55 | <on_enable function="Object.EnableReportAbuse" /> | 55 | <on_enable function="Object.EnableReportAbuse" /> |
56 | </menu_item_call> | 56 | </menu_item_call> |
57 | <menu_item_separator /> | 57 | <menu_item_call enabled="false" label="Go Here" mouse_opaque="true" name="Go Here"> |
58 | <on_click function="GoToObject" /> | ||
59 | </menu_item_call> | ||
58 | <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect"> | 60 | <menu_item_call enabled="true" label="Inspect" mouse_opaque="true" name="Object Inspect"> |
59 | <on_click function="Object.Inspect" /> | 61 | <on_click function="Object.Inspect" /> |
60 | <on_enable function="Object.EnableInspect" /> | 62 | <on_enable function="Object.EnableInspect" /> |