livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXP-1803 CLEAN-UP -- Modified code to use the "unique" tag on the notification.

meow-7.2.2
Leslie Linden 2012-01-17 09:36:14 -08:00
parent 6b919e324e
commit 577479a3e5
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llinventorybridge.cpp
View File

@ -2244,7 +2244,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
{
if (move_is_into_outbox)
{
tooltip_msg = tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
accept = FALSE;
}
else
@ -2256,7 +2256,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
{
if (move_is_into_outbox)
{
tooltip_msg = tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
accept = FALSE;
}
else
@ -3765,7 +3765,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
}
else if (move_is_into_outbox)
{
tooltip_msg = tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
accept = FALSE;
}
@ -3796,7 +3796,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
{
if (move_is_into_outbox)
{
tooltip_msg = tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
accept = FALSE;
}
else
@ -3823,7 +3823,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
if (move_is_into_outbox)
{
tooltip_msg = tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
tooltip_msg = LLTrans::getString("TooltipOutboxNotInInventory");
accept = FALSE;
}
else if (move_is_into_current_outfit || move_is_into_outfit)

13
indra/newview/llinventoryfunctions.cpp
View File

@ -533,7 +533,6 @@ void show_item_original(const LLUUID& item_uuid)
}
static S32 create_folder_in_outbox_operation_id = -1;
static S32 move_to_outbox_operation_id = -1;
static std::list<LLSD> move_to_outbox_payloads;
@ -542,11 +541,6 @@ void open_outbox()
LLFloaterReg::showInstance("outbox");
}
void folder_created_in_outbox_cb(const LLSD& notification, const LLSD& response)
{
create_folder_in_outbox_operation_id = -1;
}
LLUUID create_folder_in_outbox_for_item(LLInventoryItem* item, const LLUUID& destFolderId, S32 operation_id)
{
llassert(item);
@ -555,12 +549,7 @@ LLUUID create_folder_in_outbox_for_item(LLInventoryItem* item, const LLUUID& des
LLUUID created_folder_id = gInventory.createNewCategory(destFolderId, LLFolderType::FT_NONE, item->getName());
gInventory.notifyObservers();
if (create_folder_in_outbox_operation_id != operation_id)
{
LLNotificationsUtil::add("OutboxFolderCreated", LLSD(), LLSD(), boost::bind(&folder_created_in_outbox_cb, _1, _2));
create_folder_in_outbox_operation_id = operation_id;
}
LLNotificationsUtil::add("OutboxFolderCreated");
return created_folder_id;
}

1
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -214,6 +214,7 @@ You don't have permission to copy one or more of these items to the Merchant Out
icon="OutboxStatus_Success"
name="OutboxFolderCreated"
type="outbox">
<unique/>
A new folder has been created for each item you have transferred into the top level of your Merchant Outbox.
<usetemplate