summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-10-21 03:39:04 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-10-21 03:39:04 +0000
commitfe9719e8047e288bfb97068b7addd5dc50ffa739 (patch)
tree9f5caf26737026a56bb596885f51817b9aae686f /indra/newview/skins/default
parentb782560865c55c49a58d98af38cb2ea0ecb8448b (diff)
Merging revisions 2094-2099 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1612 EXT-1604 EXT-1163 EXT-1163 EXT-1167 * Dev: EXT-1516
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/menu_places_gear_folder.xml9
-rw-r--r--indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml9
2 files changed, 18 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 c95cf32a5a..29fb4990d0 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
@@ -34,6 +34,9 @@
<on_click
function="Places.LandmarksGear.CopyPaste.Action"
parameter="cut" />
+ <on_enable
+ function="Places.LandmarksGear.Enable"
+ parameter="cut" />
</menu_item_call>
<menu_item_call
label="Copy"
@@ -61,6 +64,9 @@
<on_click
function="Places.LandmarksGear.CopyPaste.Action"
parameter="rename" />
+ <on_enable
+ function="Places.LandmarksGear.Enable"
+ parameter="rename" />
</menu_item_call>
<menu_item_call
label="Delete"
@@ -69,6 +75,9 @@
<on_click
function="Places.LandmarksGear.CopyPaste.Action"
parameter="delete" />
+ <on_enable
+ function="Places.LandmarksGear.Enable"
+ parameter="delete" />
</menu_item_call>
<menu_item_separator
layout="topleft" />
diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
index 0246d775ee..9d2d162270 100644
--- a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
+++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml
@@ -66,6 +66,9 @@
<on_click
function="Places.LandmarksGear.CopyPaste.Action"
parameter="cut" />
+ <on_enable
+ function="Places.LandmarksGear.Enable"
+ parameter="cut" />
</menu_item_call>
<menu_item_call
label="Copy Landmark"
@@ -101,6 +104,9 @@
<on_click
function="Places.LandmarksGear.CopyPaste.Action"
parameter="rename" />
+ <on_enable
+ function="Places.LandmarksGear.Enable"
+ parameter="rename" />
</menu_item_call>
<menu_item_call
label="Delete"
@@ -109,6 +115,9 @@
<on_click
function="Places.LandmarksGear.CopyPaste.Action"
parameter="delete" />
+ <on_enable
+ function="Places.LandmarksGear.Enable"
+ parameter="delete" />
</menu_item_call>
<menu_item_separator
layout="topleft" />