summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-02-17 17:43:54 -0800
committerMerov Linden <merov@lindenlab.com>2012-02-17 17:43:54 -0800
commit2fdb18971b01bb9026e2918b79993f0a2629994b (patch)
tree44795ca7deb336b0f8eef4009c3ee012da8cdd55 /indra/newview
parent39e9a17c11d84d65645f2664b077438e9be1d449 (diff)
EXP-1897 : Suppress the copy of UUID on text clipboard when copy/cut items (back to old behavior).
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llinventorybridge.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 9fcad8093c..cac1dbfe4a 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -214,7 +214,7 @@ BOOL LLInvFVBridge::cutToClipboard() const
if (obj && isItemMovable() && isItemRemovable())
{
LLClipboard::getInstance()->setCutMode(true, boost::bind(LLFolderView::removeCutItems));
- return LLClipboard::getInstance()->addToClipboard(mUUID,obj->getType());
+ return LLClipboard::getInstance()->addToClipboard(mUUID);
}
return FALSE;
}
@@ -224,7 +224,7 @@ BOOL LLInvFVBridge::copyToClipboard() const
const LLInventoryObject* obj = gInventory.getObject(mUUID);
if (obj && isItemCopyable())
{
- return LLClipboard::getInstance()->addToClipboard(mUUID,obj->getType());
+ return LLClipboard::getInstance()->addToClipboard(mUUID);
}
return FALSE;
}