merge

1 files changed, 6 insertions, 1 deletions

diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index b18e543f0a..15a8aacd37 100644
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -303,7 +303,7 @@ BOOL LLConversationViewSession::handleMouseUp( S32 x, S32 y, MASK mask )
 		LLConversationItem* item = dynamic_cast<LLConversationItem *>(getViewModelItem());
 		LLUUID session_id = item? item->getUUID() : LLUUID();
 		LLFloaterIMSessionTab* session_floater = LLFloaterIMSessionTab::findConversation(session_id);
-		if(!session_floater->hasFocus())
+		if(session_floater && !session_floater->hasFocus())
 		{
 			session_floater->setFocus(true);
 		}
@@ -458,6 +458,11 @@ void LLConversationViewSession::refresh()
 			}
 		}
 	}
+    
+    if (mSpeakingIndicator)
+    {
+        mSpeakingIndicator->setShowParticipantsSpeaking(mIsInActiveVoiceChannel);
+    }
 	requestArrange();
 	// Do the regular upstream refresh
 	LLFolderViewFolder::refresh();