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.h | |
| 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.h')
| -rw-r--r-- | indra/newview/lltooldraganddrop.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h index 273d23d1a0..188d36cd1b 100644 --- a/indra/newview/lltooldraganddrop.h +++ b/indra/newview/lltooldraganddrop.h @@ -88,6 +88,7 @@ public: boost::signals2::connection setEndDragCallback( const enddrag_signal_t::slot_type& cb ) { return mEndDragSignal.connect(cb); } uuid_vec_t::size_type getCargoIDsCount() const { return mCargoIDs.size(); } + static S32 getOperationId() { return sOperationId; } protected: enum EDropTarget @@ -127,6 +128,8 @@ protected: LLUUID mSourceID; LLUUID mObjectID; + static S32 sOperationId; + LLVector3d mLastCameraPos; LLVector3d mLastHitPos; |