diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-06-01 14:13:56 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-06-01 14:13:56 +0300 |
| commit | b41aa1e0b2460f917d4d6cf4ddb2d641312455b5 (patch) | |
| tree | 4d9bc98ea130df687464afe30d0097817a8375c3 /indra/newview/llfloateravatarpicker.cpp | |
| parent | 785abfcf41b02de8ea5b82be578b0c2d80747475 (diff) | |
EXT-6710 FIXED Added inventory items sharing confirmation and modified alert about non-copy objects sharing.
Current behavior:
* user will be prompted about sharing items regardless is it one or more items;
* user will be prompted about trying to share one ore more non-copy items;
* in case user tries to share non-copy items among with copy items — copy tems will be shared and user will be prompted about sharing non-copy items
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/475/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloateravatarpicker.cpp')
| -rw-r--r-- | indra/newview/llfloateravatarpicker.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index b40c19c2c6..96364f9418 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -437,7 +437,7 @@ BOOL LLFloaterAvatarPicker::handleDragAndDrop(S32 x, S32 y, MASK mask, session_id = gIMMgr->addSession(avatar_name, IM_NOTHING_SPECIAL, dest_agent_id); } return LLToolDragAndDrop::handleGiveDragAndDrop(dest_agent_id, session_id, drop, - cargo_type, cargo_data, accept); + cargo_type, cargo_data, accept, getName()); } } } |