diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-13 11:17:02 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-13 11:17:02 -0700 |
| commit | 201d0659192977071ff0fc2219a28ecbc3025171 (patch) | |
| tree | b7e0161cda7545624cac6ebc294001f25f3fb2c2 /indra/newview/skins/default/xui/en | |
| parent | ba96fb5c2b6801398481a30189f991cff98fed8b (diff) | |
EXP-1071 FIX -- User can drag items to Received Items folder under Recent Tab
* Inventory panel now has an optional "accepts_drag_and_drop" parameter set to
true by default.
* Recent Inventory Panel sets "accepts_drag_and_drop" to false.
* Items can still be dragged out of Recent to a second inventory panel.
Reviewed by Leyla.
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_main_inventory.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/inventory_panel.xml | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 888230a00e..e6c5110999 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -82,10 +82,11 @@ left="0" name="All Items" sort_order_setting="InventorySortOrder" - show_item_link_overlays="true" + show_item_link_overlays="true" top="16" width="288" /> <recent_inventory_panel + accepts_drag_and_drop="false" bg_opaque_color="DkGray2" bg_alpha_color="DkGray2" background_visible="true" @@ -99,7 +100,7 @@ layout="topleft" left_delta="0" name="Recent Items" - show_item_link_overlays="true" + show_item_link_overlays="true" width="290" /> </tab_container> <layout_stack diff --git a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml index 00f4c43915..eaf148c5e4 100644 --- a/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml +++ b/indra/newview/skins/default/xui/en/widgets/inventory_panel.xml @@ -4,11 +4,12 @@ background_visible="true" background_opaque="true" show_load_status="true" + accepts_drag_and_drop="true" > <scroll - name="Inventory Scroller" - follows="all" - reserve_scroll_corner="true" - tab_stop="true" - /> + name="Inventory Scroller" + follows="all" + reserve_scroll_corner="true" + tab_stop="true" + /> </panel> |