summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerattachmenu.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-08-07 12:47:08 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-08-07 12:47:08 +0100
commit4db872e11ea5d322c20de9ddde484cb39690c1a2 (patch)
tree742c8d48a2a33c973f7ec0f2f20cab4e806bcb3c /indra/newview/llviewerattachmenu.cpp
parent78e7bde7ac65821084cb13a6a58b4f049e436be1 (diff)
parentff6eccd32db0cf57e16db8941b25a12dbb64b9fa (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llviewerattachmenu.cpp')
-rw-r--r--indra/newview/llviewerattachmenu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerattachmenu.cpp b/indra/newview/llviewerattachmenu.cpp
index f683bd8674..5b3c4ea773 100644
--- a/indra/newview/llviewerattachmenu.cpp
+++ b/indra/newview/llviewerattachmenu.cpp
@@ -122,7 +122,7 @@ void LLViewerAttachMenu::attachObjects(const uuid_vec_t& items, const std::strin
LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getLinkedItem(id);
if(item && gInventory.isObjectDescendentOf(id, gInventory.getRootFolderID()))
{
- rez_attachment(item, attachmentp);
+ rez_attachment(item, attachmentp); // don't replace if called from an "Attach To..." menu
}
else if(item && item->isFinished())
{