diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 14:47:43 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-06 14:47:43 +0100 |
| commit | 3c47d1faf1abb38ad05036de65bea3b7e21f683f (patch) | |
| tree | 2a33d4ee90d0287436c63a5f8fa90cf8fd1d6ef6 /indra/newview/lltexturectrl.cpp | |
| parent | 20c660569df71f677065b5f5f66477ebbd6b35b6 (diff) | |
| parent | a63c59be9e7df57143ddd04e44263c232f420a21 (diff) | |
another hairy merge from viewer-trunk :(
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index a1b3c8dabd..5381f8291a 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -292,7 +292,7 @@ BOOL LLFloaterTexturePicker::handleDragAndDrop( { BOOL handled = FALSE; - if (cargo_type == DAD_TEXTURE) + if ((cargo_type == DAD_TEXTURE) || (cargo_type == DAD_MESH)) { LLInventoryItem *item = (LLInventoryItem *)cargo_data; @@ -1163,7 +1163,9 @@ 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)) + if (getEnabled() && + ((cargo_type == DAD_TEXTURE) || (cargo_type == DAD_MESH)) && + allowDrop(item)) { if (drop) { |