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/lltexturectrl.cpp | |
| parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) | |
| parent | 43083743747bece13301e2789ab36ed7e4886aba (diff) | |
merge
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 56e9739350..1023a4339b 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -289,7 +289,9 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop( { BOOL handled = FALSE; - if (cargo_type == DAD_TEXTURE) + bool is_mesh = cargo_type == DAD_MESH; + + if ((cargo_type == DAD_TEXTURE) || is_mesh) { LLInventoryItem *item = (LLInventoryItem *)cargo_data; @@ -1206,7 +1208,11 @@ BOOL LLTextureCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask, // returns true, then the cast was valid, and we can perform // the third test without problems. LLInventoryItem* item = (LLInventoryItem*)cargo_data; - if (getEnabled() && (cargo_type == DAD_TEXTURE) && allowDrop(item)) + bool is_mesh = cargo_type == DAD_MESH; + + if (getEnabled() && + ((cargo_type == DAD_TEXTURE) || is_mesh) && + allowDrop(item)) { if (drop) { |