diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-06-18 17:52:54 +0300 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-06-18 17:52:54 +0300 |
| commit | 129da72326e0a314717652650ef6f4378d7794a0 (patch) | |
| tree | 7bc2448a42b0f3b125ec9f0a3f53492f7d0f430c /indra/newview/llavataractions.cpp | |
| parent | 2c5af9672c8b531762475c752dd1904a4024ff67 (diff) | |
EXT-6710 FIXED Corrected 'ItemsShared' notification message and provided logging of 'item shared' message instead of spawning IM session and add message to it.
Details:
1 Corrected 'ItemsShared' notification message.
2 Avoided spawning session on item shared event.
3 Provided logging of item shared message.
4 Provided logging of 'IMSystemMessageTip' notification without opened related IM session.
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/612/
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llavataractions.cpp')
| -rw-r--r-- | indra/newview/llavataractions.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 2dafe295fe..5bc3b3ac8d 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -550,11 +550,10 @@ namespace action_give_inventory // iterate through avatars for(S32 i = 0; i < count; ++i) { - const std::string& avatar_name = LLShareInfo::instance().mAvatarNames[i]; const LLUUID& avatar_uuid = LLShareInfo::instance().mAvatarUuids[i]; - // Start up IM before give the item - const LLUUID session_id = gIMMgr->addSession(avatar_name, IM_NOTHING_SPECIAL, avatar_uuid); + // We souldn't open IM session, just calculate session ID for logging purpose. See EXT-6710 + const LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL, avatar_uuid); uuid_set_t::const_iterator it = inventory_selected_uuids.begin(); const uuid_set_t::const_iterator it_end = inventory_selected_uuids.end(); |