From 3792a6aab8d8cf32fa82353fb7be1b895223e41b Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Wed, 28 Nov 2012 19:39:27 +0200
Subject: 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()
---
indra/newview/llimview.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'indra/newview')
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;
}
--
cgit v1.2.3