summaryrefslogtreecommitdiff
path: root/indra/newview/llimprocessing.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2018-06-21 13:26:15 -0400
committerNat Goodspeed <nat@lindenlab.com>2018-06-21 13:26:15 -0400
commite766d9e697eae29b3f82106603843efbeb7aa01b (patch)
tree872a0ab94d81699ec3ea1f7113c9c56e2a2486d3 /indra/newview/llimprocessing.cpp
parentd26c931ae2c5d33adc5fc20842b7be838a2822b4 (diff)
parentdc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff)
DRTVWR-447: Merge up to latest viewer-release
Diffstat (limited to 'indra/newview/llimprocessing.cpp')
-rw-r--r--indra/newview/llimprocessing.cpp36
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;