summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-22 13:25:04 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-22 13:25:04 +0100
commita75f44505abd80ab96504ed8af6d65cdfac658da (patch)
tree9cbc09d0524efcf30e9aff1100e15bb65ee48e27 /indra
parentf007369357463aed8311b4e609fd31a8aa26f59c (diff)
CID-512:
Checker: DEADCODE Function: show_item_sharing_confirmation(std::basic_string<char, std::char_traits<char>, std::allocator<char>>, LLViewerInventoryItem *, const LLSD &, const LLUUID &, const LLUUID &) File: /indra/newview/lltooldraganddrop.cpp
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lltooldraganddrop.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index d6e069b3dc..6bb95168e2 100644
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1446,10 +1446,10 @@ static void give_inventory_cb(const LLSD& notification, const LLSD& response)
}
static void show_item_sharing_confirmation(const std::string name,
- LLViewerInventoryItem* inv_item,
- const LLSD& dest,
- const LLUUID& dest_agent,
- const LLUUID& session_id = LLUUID::null)
+ LLViewerInventoryItem* inv_item,
+ const LLSD& dest,
+ const LLUUID& dest_agent,
+ const LLUUID& session_id = LLUUID::null)
{
if (!inv_item)
{
@@ -1459,7 +1459,7 @@ static void show_item_sharing_confirmation(const std::string name,
LLSD substitutions;
substitutions["RESIDENTS"] = name;
- substitutions["ITEMS"] = inv_item ? inv_item->getName() : LLStringUtil::null;
+ substitutions["ITEMS"] = inv_item->getName();
LLSD payload;
payload["agent_id"] = dest_agent;
payload["item_id"] = inv_item->getUUID();