diff options
author | Dave Parks <davep@lindenlab.com> | 2011-05-16 16:11:56 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-05-16 16:11:56 -0500 |
commit | 26f321bf6530734173792f92316b32c470cc1b20 (patch) | |
tree | b6c913bc714ce29ee559a0da49c6318051637789 /indra/newview/llpanelgroupnotices.cpp | |
parent | 113f532ee57eeeca4dc7eb6ca05f923f1f3543d3 (diff) | |
parent | 8ae550996c70df16b707f6773666b93409123689 (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()) |