diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-06-21 13:45:12 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-06-21 13:45:12 +0100 |
| commit | a069e0d3db0e0771e54768a702fa18e57415992e (patch) | |
| tree | 0216de28c44dd31278fcd47c09b8cc54c2891c7b /indra/newview/llavataractions.cpp | |
| parent | c0129e4b11455a05a94300e1649cf3edaaf824aa (diff) | |
| parent | b12c98e48ce44df907c7477e1c21061778459496 (diff) | |
Merge
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(); |