diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-05-20 17:41:00 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-05-20 17:41:00 +0200 |
| commit | 1300f77fdd48d90d09a05058ffdf10df93092391 (patch) | |
| tree | 1cefd5cb64be5ae614b4930dcd0a55cf4fc06109 /indra/newview/lltooldraganddrop.cpp | |
| parent | 8199cc997aeaccc72b5bd5389ded8afc7b9c379c (diff) | |
| parent | aa0a0542a10ba6faeca34afd6e323b505493d8dc (diff) | |
Merged with viewer-beta
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; |