diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-08 12:15:36 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-08 12:15:36 -0700 |
| commit | 18077965146922efb6541734bc3f7307efb4f586 (patch) | |
| tree | 1026de53ac1b12e8d81f77badc9b836afb8c2b13 /indra/newview | |
| parent | b4a53226c8b1b4a31c0f1411b110a0a32fa3599f (diff) | |
Fix post merge build issue: take clipboard changes into account
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llavatarlistitem.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index e670d3ea04..7ba63bc4a2 100644 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -383,7 +383,6 @@ BOOL LLAvatarListItem::handleHover(S32 x, S32 y, MASK mask) uuid_vec_t cargo_ids; types.push_back(DAD_PERSON); cargo_ids.push_back(mAvatarId); - gClipboard.setSourceObject(mAvatarId, LLAssetType::AT_PERSON); LLToolDragAndDrop::ESource src = LLToolDragAndDrop::SOURCE_PEOPLE; LLToolDragAndDrop::getInstance()->beginMultiDrag(types, cargo_ids, src); } |