diff options
author | Dave Parks <davep@lindenlab.com> | 2011-04-21 16:23:00 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-04-21 16:23:00 -0500 |
commit | 19857d0cf0eedb76cac4eb8a1a4a0b33de9e4235 (patch) | |
tree | 09d6015fedca390d1a259a9911491087cf088df5 /indra/newview/llpanelgroupnotices.cpp | |
parent | 120f31502eb521c1e0abaeb24972f070e7f75bd6 (diff) | |
parent | 4bbfdd4c1fc18162960ba61fbdad40940a4cdd89 (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()) |