summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-04-02 17:32:11 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-04-02 17:32:11 +0300
commit47f5a2f7f9482eced5451e4bf9a61114c56575ee (patch)
tree9d230577887c416a375560ef2c7d22bbe7f46af5 /indra
parenteb6b389b9994b3414c3fe00eeaea08967f4309e0 (diff)
MAINT-8203 LLIMInfo crash due to capability
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llimprocessing.cpp34
1 files changed, 32 insertions, 2 deletions
diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp
index 0c4db3dc6c..da0c218f9f 100644
--- a/indra/newview/llimprocessing.cpp
+++ b/indra/newview/llimprocessing.cpp
@@ -593,14 +593,44 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
case IM_TYPING_START:
{
- LLPointer<LLIMInfo> im_info = new LLIMInfo(gMessageSystem);
+ 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);
}
break;
case IM_TYPING_STOP:
{
- LLPointer<LLIMInfo> im_info = new LLIMInfo(gMessageSystem);
+ 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);
}
break;