diff options
| author | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-11-28 19:39:27 +0200 |
|---|---|---|
| committer | AlexanderP ProductEngine <apaschenko@productengine.com> | 2012-11-28 19:39:27 +0200 |
| commit | 3792a6aab8d8cf32fa82353fb7be1b895223e41b (patch) | |
| tree | b6fe9a97db63c986b0817269e4d013c2d5e242ca /indra/newview/llimview.cpp | |
| parent | 1a9a55087248eb76330761c2f67e989135472153 (diff) | |
CHUI-546 FIXED Blank IM toast shown when a nearby chat toast is shown:
Prosessing of the nearby chat was exluded from on_new_message()
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; } |