diff options
author | Dave Parks <davep@lindenlab.com> | 2011-05-02 14:52:12 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-05-02 14:52:12 -0500 |
commit | a25f8987032afede673b818fe7544975eba036b5 (patch) | |
tree | cfa15a82661d407fd9f2031e7dfd6f7e0be48bb2 /indra/newview/llpanelgroupnotices.cpp | |
parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) | |
parent | 43083743747bece13301e2789ab36ed7e4886aba (diff) |
merge
Diffstat (limited to 'indra/newview/llpanelgroupnotices.cpp')
-rw-r--r-- | indra/newview/llpanelgroupnotices.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llpanelgroupnotices.cpp b/indra/newview/llpanelgroupnotices.cpp index cdf6e51bf8..e64192c2ae 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -154,6 +154,7 @@ BOOL LLGroupDropTarget::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, case DAD_ANIMATION: case DAD_GESTURE: case DAD_CALLINGCARD: + case DAD_MESH: { LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data; if(gInventory.getItem(inv_item->getUUID()) |