diff options
author | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
commit | 2ed1de224a45fafb12fea42e8dfb83f9728cdcf1 (patch) | |
tree | a78f96c5ada866ec93cbba72f2c7bf1daf7ade80 /indra/newview/lltooldraganddrop.cpp | |
parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
parent | e328dcf4062177c903d3099d0d16477824d23025 (diff) |
Automated merge with http://hg.secondlife.com/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) { } |