diff options
author | prep <none@none> | 2012-03-13 15:48:24 -0400 |
---|---|---|
committer | prep <none@none> | 2012-03-13 15:48:24 -0400 |
commit | fab57eea612f34ed9d8c8559674ead1760aab42b (patch) | |
tree | 51394d44e1b89bb75d168464aec539f60f44f8cd /indra/newview/lltooldraganddrop.cpp | |
parent | 87b414c4934d0d52eef0b323245568bb1e95ec70 (diff) | |
parent | 00717147d2b832fa3239267edf409f0a1dfcd9fd (diff) |
pull and merge from viewer-development
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) { } |