diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-12 17:01:23 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-12 17:01:23 -0800 |
| commit | ba41aea4b2813ac96cad2bae7c82da6e5eefd63a (patch) | |
| tree | 3a57c449c2c37ebdea3242d0158c77751cac0740 /indra/newview/lltooldraganddrop.cpp | |
| parent | ec2b0e3af34bee7870283e5af2d16f879ad68f1b (diff) | |
EXP-1795 FIX -- Update warning dialog for dragging and dropping no-copy items to Merchant Outbox
* Any drag and drop or copy operation to the merchant outbox that contains one
or more no-copy items now brings up a single modal dialog prompting the user
to move the no-copy items to the outbox or to leave them all behind.
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 5a4d177709..8c32dfcb4d 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -282,6 +282,8 @@ void LLCategoryDropDescendentsObserver::done() } */ +S32 LLToolDragAndDrop::sOperationId = 0; + LLToolDragAndDrop::DragAndDropEntry::DragAndDropEntry(dragOrDrop3dImpl f_none, dragOrDrop3dImpl f_self, dragOrDrop3dImpl f_avatar, @@ -644,6 +646,12 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop, mToolTipMsg.clear(); + // Increment the operation id for every drop + if (drop) + { + sOperationId++; + } + if (top_view) { handled = TRUE; |