diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-02-02 12:22:00 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-02-02 12:22:00 -0800 |
| commit | c1e47e0acab0d82ae25d65d64ac22afca6f2bd12 (patch) | |
| tree | f8c39b6a4a80c25604aba3b88f9a90e8958883c5 /indra/newview/lltooldraganddrop.cpp | |
| parent | ff10555bd8b64c5353b17b0389e8ec91241d5343 (diff) | |
EXP-1856 FIX -- Calling cards, library items, 'no transfer' objects can be copied to Merchant outbox via ctrl-v
* Viewer now applies the same logic as inventory drag and drop to clipboard
paste operations.
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 8c32dfcb4d..c7ab934f9e 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -333,14 +333,15 @@ LLToolDragAndDrop::LLDragAndDropDictionary::LLDragAndDropDictionary() }; LLToolDragAndDrop::LLToolDragAndDrop() -: LLTool(std::string("draganddrop"), NULL), - mDragStartX(0), - mDragStartY(0), - mSource(SOURCE_AGENT), - mCursor(UI_CURSOR_NO), - mLastAccept(ACCEPT_NO), - mDrop(FALSE), - mCurItemIndex(0) +: LLTool(std::string("draganddrop"), NULL), + mCargoCount(0), + mDragStartX(0), + mDragStartY(0), + mSource(SOURCE_AGENT), + mCursor(UI_CURSOR_NO), + mLastAccept(ACCEPT_NO), + mDrop(FALSE), + mCurItemIndex(0) { } |