diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-07-09 23:37:52 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-09 23:37:52 +0000 |
| commit | fbf1d2a6110a19fd164f6c27a748ce27731b938d (patch) | |
| tree | b0c2e7d44863d212ef9ab58803f705462e0d9653 /indra/newview/llviewermessage.cpp | |
| parent | 97a33b8322ee5c38b13424f8ae3c840f4ffec76f (diff) | |
| parent | 8edcb5bf89de420ffd42a24cb1fb22c86e1c7571 (diff) | |
Merged in euclid-pull_to_LMR4-13397-13443 (pull request #192)
Pull MAINT fixes for SL-13397 and SL-13443 into LMR#4 branch
Approved-by: Andrey Kleshchev
Approved-by: Michael Pohoreski
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index e077626461..e1c44d6be8 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -2220,8 +2220,12 @@ protected: } }; +static LLTrace::BlockTimerStatHandle FTM_PROCESS_IMPROVED_IM("Process IM"); + void process_improved_im(LLMessageSystem *msg, void **user_data) { + LL_RECORD_BLOCK_TIME(FTM_PROCESS_IMPROVED_IM); + LLUUID from_id; BOOL from_group; LLUUID to_id; |