summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2010-04-13 21:39:13 +0300
committerAndrew Dyukov <adyukov@productengine.com>2010-04-13 21:39:13 +0300
commit91e00620d8ac1f57c8e22ca568ba2d0fcd7cbdfc (patch)
tree155acac6dad43c9bd9b1a7dd75ec73903e35ebc1 /indra/newview
parent3a5ae14b85d0ba8d562cddaa06f6c0bc0dccde33 (diff)
Fixed normal bug EXT-4915 (Duplicated "Buy" item in object context menu).
- Bug was caused by making "Take" menu item from object context menu consistent with the one from Build->Object menu where it was replaced by "Buy" when it was needed. But in object menu we already have "Buy" option at the bottom of the list so we don't need to hide "Take" and show "Buy" instead. Removed appearance of "Buy" instead of "Take" and made "Take" item's behaviour consistent with "Take" from object inspector gear menu. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/227/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/menu_object.xml17
1 files changed, 2 insertions, 15 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 2c97112e38..8b10c7b049 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -138,26 +138,13 @@
</context_menu>
<menu_item_separator layout="topleft" />
<menu_item_call
- label="Buy"
- layout="topleft"
- name="Pie Object Bye">
- <menu_item_call.on_click
- function="Tools.BuyOrTake"/>
- <menu_item_call.on_visible
- function="Tools.VisibleBuyObject"/>
- <menu_item_call.on_enable
- function="Tools.EnableBuyOrTake"/>
- </menu_item_call>
- <menu_item_call
label="Take"
layout="topleft"
name="Pie Object Take">
<menu_item_call.on_click
- function="Tools.BuyOrTake"/>
- <menu_item_call.on_visible
- function="Tools.VisibleTakeObject"/>
+ function="Object.Take"/>
<menu_item_call.on_enable
- function="Tools.EnableBuyOrTake"/>
+ function="Object.VisibleTake"/>
</menu_item_call>
<menu_item_call
enabled="false"