diff options
author | Rider Linden <rider@lindenlab.com> | 2018-06-21 09:13:19 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-06-21 09:13:19 -0700 |
commit | f07dc421e81d945531dc6f4befc19ea4fe4b9a47 (patch) | |
tree | 7ac8fa1fbfad64c616161488a5d0be10c1eaba34 /indra/newview/llimprocessing.cpp | |
parent | 8b3957b310afa23e543c3eb33aca9131dba52b31 (diff) | |
parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) |
Merge
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
-rw-r--r-- | indra/newview/llimprocessing.cpp | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index db1bc56fc5..491671c46f 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -593,45 +593,13 @@ void LLIMProcessing::processNewMessage(LLUUID from_id, case IM_TYPING_START: { - std::vector<U8> bucket(binary_bucket[0], binary_bucket_size); - LLSD data; - data["binary_bucket"] = bucket; - LLPointer<LLIMInfo> im_info = new LLIMInfo(from_id, - from_group, - to_id, - dialog, - agentName, - message, - session_id, - parent_estate_id, - region_id, - position, - data, - offline, - timestamp); - gIMMgr->processIMTypingStart(im_info); + gIMMgr->processIMTypingStart(from_id, dialog); } break; case IM_TYPING_STOP: { - std::vector<U8> bucket(binary_bucket[0], binary_bucket_size); - LLSD data; - data["binary_bucket"] = bucket; - LLPointer<LLIMInfo> im_info = new LLIMInfo(from_id, - from_group, - to_id, - dialog, - agentName, - message, - session_id, - parent_estate_id, - region_id, - position, - data, - offline, - timestamp); - gIMMgr->processIMTypingStop(im_info); + gIMMgr->processIMTypingStop(from_id, dialog); } break; |