diff options
author | Cho <cho@lindenlab.com> | 2013-02-01 18:54:15 +0000 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2013-02-01 18:54:15 +0000 |
commit | 56b158e486f97f26c87ac37923f5dfbc2cc7548a (patch) | |
tree | f29399d0d297573d5560a496ae1367436815656b /indra/newview/llavatarlistitem.cpp | |
parent | 97930c72b6f869e9bb47cda7d9ecfccf1a25a3fa (diff) |
CHUI-675 FIX You can select multiple users in people floater but can only drag and drop one name to conversation
Moved drag and drop start in LLAvatarListItem instead of LLAvatarList, and made LLFloaterIMSession handle multiple dropped participants correctly
Diffstat (limited to 'indra/newview/llavatarlistitem.cpp')
-rw-r--r-- | indra/newview/llavatarlistitem.cpp | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index 3ed0c7c482..3e6c817dd6 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -368,61 +368,6 @@ BOOL LLAvatarListItem::handleDoubleClick(S32 x, S32 y, MASK mask) return LLPanel::handleDoubleClick(x, y, mask); } -BOOL LLAvatarListItem::handleMouseDown(S32 x, S32 y, MASK mask) -{ - if (LLUICtrl::handleMouseDown(x, y, mask)) - { - return TRUE; - } - - gFocusMgr.setMouseCapture(this); - - S32 screen_x; - S32 screen_y; - localPointToScreen(x, y, &screen_x, &screen_y); - LLToolDragAndDrop::getInstance()->setDragStart(screen_x, screen_y); - - return TRUE; -} - -BOOL LLAvatarListItem::handleMouseUp( S32 x, S32 y, MASK mask ) -{ - if (LLUICtrl::childrenHandleMouseUp(x, y, mask)) - { - return TRUE; - } - - if(hasMouseCapture()) - { - gFocusMgr.setMouseCapture(NULL); - } - return TRUE; -} - -BOOL LLAvatarListItem::handleHover(S32 x, S32 y, MASK mask) -{ - bool handled = hasMouseCapture(); - if(handled) - { - S32 screen_x; - S32 screen_y; - localPointToScreen(x, y, &screen_x, &screen_y); - - if(LLToolDragAndDrop::getInstance()->isOverThreshold(screen_x, screen_y)) - { - // First, create the global drag and drop object - std::vector<EDragAndDropType> types; - uuid_vec_t cargo_ids; - types.push_back(DAD_PERSON); - cargo_ids.push_back(mAvatarId); - LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_PEOPLE; - LLToolDragAndDrop::getInstance()->beginMultiDrag(types, cargo_ids, src); - } - } - - return handled; -} - void LLAvatarListItem::setValue( const LLSD& value ) { if (!value.isMap()) return;; |