Merge pull request #116 from secondlife/roxie/webrtc-voice

WebRTC-based voice for Second Life

1 files changed, 1 insertions, 5 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 3853aaa8fd..ca27dbd818 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -311,7 +311,7 @@ bool LLAgent::isActionAllowed(const LLSD& sdname)
             }
             else
             {
-                allow_agent_voice = channel->isActive() && channel->callStarted();
+                allow_agent_voice = channel->isActive();
             }
         }
 
@@ -4078,10 +4078,6 @@ bool LLAgent::teleportCore(bool is_local)
 	}
 	make_ui_sound("UISndTeleportOut");
 	
-	// MBW -- Let the voice client know a teleport has begun so it can leave the existing channel.
-	// This was breaking the case of teleporting within a single sim.  Backing it out for now.
-//	LLVoiceClient::getInstance()->leaveChannel();
-	
 	return true;
 }