diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-04 15:28:08 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-06-04 15:28:08 -0400 |
| commit | 6ee04562208100fc164bd3818ab3ba73f060d90c (patch) | |
| tree | 27b544b1832a9f3d88b39bc66a5e676d5aba511b /indra/newview/lltooldraganddrop.cpp | |
| parent | 8dae8290b7be728d0c70205b1f27b08f899c9d32 (diff) | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
merge
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index c7ab934f9e..4f4eef0f3d 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -48,6 +48,7 @@ #include "llpreviewnotecard.h" #include "llrootview.h" #include "llselectmgr.h" +#include "lltoolbarview.h" #include "lltoolmgr.h" #include "lltooltip.h" #include "lltrans.h" @@ -2528,7 +2529,7 @@ LLInventoryObject* LLToolDragAndDrop::locateInventory( } else if(mSource == SOURCE_VIEWER) { - item = (LLViewerInventoryItem*)gClipboard.getSourceObject(); + item = (LLViewerInventoryItem*)gToolBarView->getDragItem(); } if(item) return item; if(cat) return cat; |