diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 20 | ||||
| -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 |
3 files changed, 22 insertions, 4 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 2d5e4938c6..3929183be2 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1153,9 +1153,17 @@ bool LLInvFVBridge::canListOnMarketplace() const } LLViewerInventoryItem * item = model->getItem(mUUID); - if (item && !item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) + if (item) { - return false; + if (!item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) + { + return false; + } + + if (LLAssetType::AT_CALLINGCARD == item->getType()) + { + return false; + } } return true; @@ -1897,7 +1905,6 @@ static BOOL can_move_to_outbox(LLInventoryItem* inv_item, std::string& tooltip_m } bool allow_transfer = inv_item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID()); - if (!allow_transfer) { tooltip_msg = LLTrans::getString("TooltipOutboxNoTransfer"); @@ -1913,6 +1920,13 @@ static BOOL can_move_to_outbox(LLInventoryItem* inv_item, std::string& tooltip_m } #endif + bool calling_card = (LLAssetType::AT_CALLINGCARD == inv_item->getType()); + if (calling_card) + { + tooltip_msg = LLTrans::getString("TooltipOutboxCallingCard"); + return false; + } + return true; } 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> |