diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-29 20:35:30 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-29 20:35:30 -0800 |
| commit | 2843ba11bccf5f5ca447138ad06bc2b557267899 (patch) | |
| tree | e8bcd39038f3a301ab6e88d67b76563114a14ef0 /indra/newview/llimview.cpp | |
| parent | 5238a39b5458a34b727ca842c456db47ef13d1b7 (diff) | |
| parent | 611797543a917f1596be73e9e79974578748086e (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 581043a3d0..e5dda7e8d8 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -171,8 +171,8 @@ void on_new_message(const LLSD& msg) return; } - // Skip toasting for system messages - if (participant_id.isNull()) + // Skip toasting for system messages and for nearby chat + if (participant_id.isNull() || session_id.isNull()) { return; } |