Notify join on connect instead of on first peer join, for adhoc-p2p incoming calls

1 files changed, 3 insertions, 6 deletions

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index bc3bc4ca1d..4fad1153ac 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -731,12 +731,11 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id,
             // which uses the voice server to relay calls and invites.  Otherwise,
             // we use the group voice provider.
             mVoiceChannel = new LLVoiceChannelP2P(session_id, name, other_participant_id, outgoingInterface);
-            mVoiceChannel->setChannelInfo(voiceChannelInfo);
         }
 		else
 		{
             p2pAsAdhocCall = true;
-            mVoiceChannel = new LLVoiceChannelGroup(session_id, name, true, true);
+            mVoiceChannel  = new LLVoiceChannelGroup(session_id, name, voiceChannelInfo.isUndefined(), true);
 		}
 	}
 	else
@@ -754,10 +753,8 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id,
 		}
 	}
 
-	if(mVoiceChannel)
-	{
-		mVoiceChannelStateChangeConnection = mVoiceChannel->setStateChangedCallback(boost::bind(&LLIMSession::onVoiceChannelStateChanged, this, _1, _2, _3));
-	}
+	mVoiceChannelStateChangeConnection = mVoiceChannel->setStateChangedCallback(boost::bind(&LLIMSession::onVoiceChannelStateChanged, this, _1, _2, _3));
+    mVoiceChannel->setChannelInfo(voiceChannelInfo);
 
 	mSpeakers = new LLIMSpeakerMgr(mVoiceChannel);