diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2011-06-07 17:16:49 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2011-06-07 17:16:49 -0700 |
commit | 1361eeae4e4538c175a32d48246897c4659cc26c (patch) | |
tree | 19687f65cc1c51b3247d0d1cd665b19c1a41a1e4 /indra/newview/llpanelgroupnotices.cpp | |
parent | bff172b374fa12e646d427e09f2ffac4289ab654 (diff) | |
parent | cf31723a1a258e0452dd26d9f5eb5fcdac290e05 (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()) |