CHUI-579: Found a small bug in my last commit causing nearby chat im's to show two toast messages. Now the upper right toast (im toasts) will only show when the session id is non NULL (Nearby chat has a session value that is NULL).

1 files changed, 4 insertions, 1 deletions

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index ab2f275711..278384cd08 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -197,7 +197,10 @@ void on_new_message(const LLSD& msg)
                 gToolBarView->flashCommand(LLCommandId("chat"), true);
 
                 //Show IM toasts (upper right toasts)
-                LLAvatarNameCache::get(participant_id, boost::bind(&on_avatar_name_cache_toast, _1, _2, msg));
+                if(session_id.notNull())
+                {
+                    LLAvatarNameCache::get(participant_id, boost::bind(&on_avatar_name_cache_toast, _1, _2, msg));
+                }
             }
         }
     }