diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-04 12:17:01 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-04 12:17:01 -0700 |
| commit | fc6c3fbe4271dcd9b64bdfd417514dc97ad7dd75 (patch) | |
| tree | bd09a20a2b4dd9384a92114eaeebe0d5bfac8e1e /indra/newview/lltooldraganddrop.cpp | |
| parent | f3aac4c8ab45d52c4f038ad1a16768d9d8e0b201 (diff) | |
| parent | 44e9fb446f3c92c3dfd9b5be8a3e02ec5a44ba00 (diff) | |
Merge with latest
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 3e5ce427a8..a8014b8cde 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -57,6 +57,7 @@ #include "llviewerwindow.h" #include "llvoavatarself.h" #include "llworld.h" +#include "llclipboard.h" // syntactic sugar #define callMemberFunction(object,ptrToMember) ((object).*(ptrToMember)) @@ -2495,6 +2496,10 @@ LLInventoryObject* LLToolDragAndDrop::locateInventory( item = (LLViewerInventoryItem*)preview->getDragItem(); } } + else if(mSource == SOURCE_VIEWER) + { + item = (LLViewerInventoryItem*)gClipboard.getSourceObject(); + } if(item) return item; if(cat) return cat; return NULL; |