CR Changes from Aimee

5 files changed, 7 insertions, 7 deletions

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 247f5b879a..109090a75a 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1848,7 +1848,7 @@ LLCallDialog(payload)
 void LLIncomingCallDialog::onLifetimeExpired()
 {
 	std::string session_handle = mPayload["session_handle"].asString();
-	if (LLVoiceClient::getInstance()->invitePending(session_handle))
+	if (LLVoiceClient::getInstance()->isValidChannel(session_handle))
 	{
 		// restart notification's timer if call is still valid
 		mLifetimeTimer.start();
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 35753178f7..9b311bbb81 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -385,11 +385,11 @@ void LLVoiceClient::callUser(const LLUUID &uuid)
 	if (mVoiceModule) mVoiceModule->callUser(uuid);
 }
 
-bool LLVoiceClient::invitePending(std::string &channelHandle)
+bool LLVoiceClient::isValidChannel(std::string &session_handle)
 {
 	if (mVoiceModule) 
 	{
-		return mVoiceModule->invitePending(channelHandle);
+		return mVoiceModule->isValidChannel(session_handle);
 	}
 	else
 	{
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index d4b4f07651..7427ea323f 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -176,7 +176,7 @@ public:
 	//@{
 	// start a voice channel with the specified user
 	virtual void callUser(const LLUUID &uuid)=0;
-	virtual bool invitePending(std::string& channelHandle)=0;
+	virtual bool isValidChannel(std::string& channelHandle)=0;
 	virtual bool answerInvite(std::string &channelHandle)=0;
 	virtual void declineInvite(std::string &channelHandle)=0;
 	//@}
@@ -326,7 +326,7 @@ static const F32 OVERDRIVEN_POWER_LEVEL;
 	std::string getCurrentChannel();
 	// start a voice channel with the specified user
 	void callUser(const LLUUID &uuid);
-	bool invitePending(std::string& channelHandle);
+	bool isValidChannel(std::string& channelHandle);
 	bool answerInvite(std::string &channelHandle);
 	void declineInvite(std::string &channelHandle);	
 	void leaveChannel(void);		// call this on logout or teleport begin
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 9d74e7c7ac..bb657841c4 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -4582,7 +4582,7 @@ void LLVivoxVoiceClient::endUserIMSession(const LLUUID &uuid)
 		LL_DEBUGS("Voice") << "Session not found for participant ID " << uuid << LL_ENDL;
 	}
 }
-bool LLVivoxVoiceClient::invitePending(std::string &sessionHandle)
+bool LLVivoxVoiceClient::isValidChannel(std::string &sessionHandle)
 {
   return(findSession(sessionHandle) != NULL);
 	
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 39759a399a..9f6c6232fd 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -166,7 +166,7 @@ public:
 	//@{
 	// start a voice channel with the specified user
 	virtual void callUser(const LLUUID &uuid);	
-	virtual bool invitePending(std::string &channelHandle);
+	virtual bool isValidChannel(std::string &channelHandle);
 	virtual bool answerInvite(std::string &channelHandle);
 	virtual void declineInvite(std::string &channelHandle);
 	//@}