From 577479a3e53ef152da191e3a004aeb34f0815658 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Tue, 17 Jan 2012 09:36:14 -0800
Subject: [PATCH] EXP-1803 CLEAN-UP -- Modified code to use the "unique" tag on
the notification.
---
indra/newview/llinventorybridge.cpp | 10 +++++-----
indra/newview/llinventoryfunctions.cpp | 13 +------------
.../newview/skins/default/xui/en/notifications.xml | 1 +
3 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 270ef4fddc9..1a4fd17d611 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -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)
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index f5be271a68d..40bc3b76c93 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -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;
}
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index e44fb3bf28d..af75d493532 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -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
--
GitLab