diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-17 13:07:57 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-17 13:07:57 -0800 |
| commit | accf83394513c82e98fffa15bc0131ee25f63f00 (patch) | |
| tree | f47890c9732fc1f4e8ec7b9c3e29d23c0cb97041 /indra/newview/skins/default | |
| parent | 2589a7e135a9e894eb7bbe0cb1e032c105f72bf8 (diff) | |
EXP-1805 FIX -- Block calling cards from being added to Merchant Outbox
EXP-1810 PROGRESS -- Cannot resize Received items panel in Inventory window
* Updated "copy to merchant outbox" context menu and drag and drop code to block calling cards.
* Changed user_resize to true on the "Received Items" panel and the main inventory panel
Diffstat (limited to 'indra/newview/skins/default')
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_inventory.xml | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 5d398a29af..fcba937bdb 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -30,6 +30,8 @@ <layout_panel name="main_inventory_layout_panel" layout="topleft" + auto_resize="true" + user_resize="true" min_dim="150" width="330" follows="bottom|left|right" @@ -48,8 +50,9 @@ </layout_panel> <layout_panel width="330" - layout="topleft" + layout="topleft" auto_resize="true" + user_resize="true" follows="left|right|top" name="inbox_layout_panel" visible="false" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 84fce6630b..3b00969fd4 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -169,6 +169,7 @@ Please try logging in again in a minute.</string> <string name="TooltipOutboxNoTransfer">One or more of these objects cannot be sold or transferred.</string> <string name="TooltipOutboxNotInInventory">Your merchant outbox can only accept items directly from your inventory</string> <string name="TooltipOutboxWorn">You can not put items you are wearing into your merchant outbox</string> + <string name="TooltipOutboxCallingCard">You can not put calling cards into your merchant outbox</string> <string name="TooltipOutboxFolderLevels">Depth of nested folders exceeds 3</string> <string name="TooltipOutboxTooManyFolders">Subfolder count in top-level folder exceeds 20</string> <string name="TooltipOutboxTooManyObjects">Item count in top-level folder exceeds 200</string> |