MAINT-8203 LLIMInfo crash due to capability

Mon, 02 Apr 2018 17:32:11 +0300

author
andreykproductengine <andreykproductengine@lindenlab.com>
date
Mon, 02 Apr 2018 17:32:11 +0300
changeset 55359
01236c0008b3
parent 55358
5e41325e8fcf
child 55360
a82d38c3babb

MAINT-8203 LLIMInfo crash due to capability

indra/newview/llimprocessing.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llimprocessing.cpp	Tue Mar 27 17:22:17 2018 +0300
     1.2 +++ b/indra/newview/llimprocessing.cpp	Mon Apr 02 17:32:11 2018 +0300
     1.3 @@ -593,14 +593,44 @@
     1.4  
     1.5          case IM_TYPING_START:
     1.6          {
     1.7 -            LLPointer<LLIMInfo> im_info = new LLIMInfo(gMessageSystem);
     1.8 +            std::vector<U8> bucket(binary_bucket[0], binary_bucket_size);
     1.9 +            LLSD data;
    1.10 +            data["binary_bucket"] = bucket;
    1.11 +            LLPointer<LLIMInfo> im_info = new LLIMInfo(from_id,
    1.12 +                    from_group,
    1.13 +                    to_id,
    1.14 +                    dialog,
    1.15 +                    agentName,
    1.16 +                    message,
    1.17 +                    session_id,
    1.18 +                    parent_estate_id,
    1.19 +                    region_id,
    1.20 +                    position,
    1.21 +                    data,
    1.22 +                    offline,
    1.23 +                    timestamp);
    1.24              gIMMgr->processIMTypingStart(im_info);
    1.25          }
    1.26          break;
    1.27  
    1.28          case IM_TYPING_STOP:
    1.29          {
    1.30 -            LLPointer<LLIMInfo> im_info = new LLIMInfo(gMessageSystem);
    1.31 +            std::vector<U8> bucket(binary_bucket[0], binary_bucket_size);
    1.32 +            LLSD data;
    1.33 +            data["binary_bucket"] = bucket;
    1.34 +            LLPointer<LLIMInfo> im_info = new LLIMInfo(from_id,
    1.35 +                    from_group,
    1.36 +                    to_id,
    1.37 +                    dialog,
    1.38 +                    agentName,
    1.39 +                    message,
    1.40 +                    session_id,
    1.41 +                    parent_estate_id,
    1.42 +                    region_id,
    1.43 +                    position,
    1.44 +                    data,
    1.45 +                    offline,
    1.46 +                    timestamp);
    1.47              gIMMgr->processIMTypingStop(im_info);
    1.48          }
    1.49          break;

mercurial