diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-05 15:08:50 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-05 15:08:50 -0500 |
| commit | 02783213455418a509994df16f9250b05753c183 (patch) | |
| tree | 2e40cd18b0fcdd9eb028fff4266c2cbd8a7ca6ba /indra | |
| parent | 83eb22f736464b34ef9871028426011c99a57e17 (diff) | |
SH-741 FIXED Mesh assets cannot be dragged into notecards
Added DAD_MESH to list of text editor -allowed drag and drop types.
Minor tab reformatting.
Diffstat (limited to 'indra')
| -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() ) |