diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-16 10:28:35 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-16 10:28:35 +0000 |
commit | aa7fadfde02d396ab04c82f91f01d486b4f5396d (patch) | |
tree | 21e0e919da0ad23f3a39b5128ba5313f0f8a78d5 /indra/newview/llpanelgroupnotices.cpp | |
parent | e3367fad368660bf40db29a82237475a9f2dfdbd (diff) | |
parent | 9c5e4d315a4b5f5a0793587c6a6620f6efc76332 (diff) |
merge from viewer2.
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 6210973dae..516020797d 100644 --- a/indra/newview/llpanelgroupnotices.cpp +++ b/indra/newview/llpanelgroupnotices.cpp @@ -158,6 +158,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()) |