diff options
| author | Palmer <palmer@lindenlab.com> | 2009-12-07 16:03:56 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-12-07 16:03:56 -0800 |
| commit | 85488f54148b2dba02eadcbd50ccbb552638c3c7 (patch) | |
| tree | dbb248900527cac25c307970fb5c817b90b715e7 /indra/newview/lltexturectrl.cpp | |
| parent | ee159d8e742a7281f304fc45b692c111706d294e (diff) | |
| parent | 9d3968bb837828568bf58113b8315c8ca2e8dae1 (diff) | |
Merge of viewer 2 changes
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 5f7c2f5080..2180f47218 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -291,7 +291,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; @@ -1154,7 +1154,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) { |