diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml index 0cbd7c6..8295d3a 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml | |||
| @@ -166,17 +166,15 @@ | |||
| 166 | <on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" /> | 166 | <on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" /> |
| 167 | </menu_item_call> | 167 | </menu_item_call> |
| 168 | <menu_item_separator name="Copy Separator" /> | 168 | <menu_item_separator name="Copy Separator" /> |
| 169 | <!-- See IMP-961 http://redmine.kokuaviewer.org/issues/961 | 169 | <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true" |
| 170 | <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true" | ||
| 171 | name="Cut" width="128"> | 170 | name="Cut" width="128"> |
| 172 | <on_click filter="" function="Inventory.DoToSelected" userdata="cut" /> | 171 | <on_click filter="" function="Inventory.DoToSelected" userdata="cut" /> |
| 173 | </menu_item_call> | 172 | </menu_item_call> |
| 174 | --> | 173 | <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true" |
| 175 | <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true" | ||
| 176 | name="Copy" width="128"> | 174 | name="Copy" width="128"> |
| 177 | <on_click filter="" function="Inventory.DoToSelected" userdata="copy" /> | 175 | <on_click filter="" function="Inventory.DoToSelected" userdata="copy" /> |
| 178 | </menu_item_call> | 176 | </menu_item_call> |
| 179 | <menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true" | 177 | <menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true" |
| 180 | name="Paste" width="128"> | 178 | name="Paste" width="128"> |
| 181 | <on_click filter="" function="Inventory.DoToSelected" userdata="paste" /> | 179 | <on_click filter="" function="Inventory.DoToSelected" userdata="paste" /> |
| 182 | </menu_item_call> | 180 | </menu_item_call> |