diff options
| author | prep <prep@lindenlab.com> | 2011-01-05 16:12:15 -0500 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-01-05 16:12:15 -0500 |
| commit | c9f3a5574e223bec95b4ec374fd164ba9a486c2a (patch) | |
| tree | edbd6574b4133488f82e872bb86d3aacda4af216 /indra/newview/llviewertexteditor.cpp | |
| parent | 5b09da5079d576678eb5d66a5518044d1b22664f (diff) | |
| parent | 7c7527b6727a6070fd7679ea28e4e2692452bf27 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
| -rw-r--r-- | indra/newview/llviewertexteditor.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index 14839d0525..4798bb536f 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -847,17 +847,18 @@ BOOL LLViewerTextEditor::handleDragAndDrop(S32 x, S32 y, MASK mask, { switch( cargo_type ) { - case DAD_CALLINGCARD: - case DAD_TEXTURE: - case DAD_SOUND: - case DAD_LANDMARK: - case DAD_SCRIPT: - case DAD_CLOTHING: - case DAD_OBJECT: - case DAD_NOTECARD: - case DAD_BODYPART: - case DAD_ANIMATION: - case DAD_GESTURE: + case DAD_CALLINGCARD: + case DAD_TEXTURE: + case DAD_SOUND: + case DAD_LANDMARK: + case DAD_SCRIPT: + case DAD_CLOTHING: + case DAD_OBJECT: + case DAD_NOTECARD: + case DAD_BODYPART: + case DAD_ANIMATION: + case DAD_GESTURE: + case DAD_MESH: { LLInventoryItem *item = (LLInventoryItem *)cargo_data; if( item && allowsEmbeddedItems() ) |