summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-07-26 16:17:52 +0300
committerMike Antipov <mantipov@productengine.com>2010-07-26 16:17:52 +0300
commit3bf5d36981752bffe12da81d72a60ccfc9b92db2 (patch)
tree20fcde88f9831330b8972c8628835d3a25e66162
parent9908fc1518e898cc7c4756124fee2e6078bcfd82 (diff)
EXT-8257 FIXED Made "Expand" and "Collapse" menu items visible in Places gear menu mutually exclusive.
Root cause: ========== The same menu is used to be shown as context and gear menus. But visibility of context Folder View's menu is processed in a separate way. So, once visibility of menu items is changed in context menu - it is unchanged in gear menu. Also it was possible situation when both "Expand" and "Collapse" menu items were visible in gear menu (If it was opened before any context menu) FIX: === Added "on_visible" callbacks for "Expand" and "Collapse" menu items to set proper visibility in "gear" menu. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/801/ --HG-- branch : product-engine
-rw-r--r--indra/newview/skins/default/xui/en/menu_places_gear_folder.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
index 3e38503e43..77cc3910fd 100644
--- a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml
@@ -94,6 +94,9 @@
<on_enable
function="Places.LandmarksGear.Enable"
parameter="expand" />
+ <on_visible
+ function="Places.LandmarksGear.Enable"
+ parameter="expand" />
</menu_item_call>
<menu_item_call
label="Collapse"
@@ -105,6 +108,9 @@
<on_enable
function="Places.LandmarksGear.Enable"
parameter="collapse" />
+ <on_visible
+ function="Places.LandmarksGear.Enable"
+ parameter="collapse" />
</menu_item_call>
<menu_item_call
label="Expand all folders"