Merge remote-tracking branch 'secondlife/release/webrtc-voice' into webrtc-voice

1 files changed, 1 insertions, 5 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 6db7088812..68136c8396 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -310,7 +310,7 @@ bool LLAgent::isActionAllowed(const LLSD& sdname)
             }
             else
             {
-                allow_agent_voice = channel->isActive() && channel->callStarted();
+                allow_agent_voice = channel->isActive();
             }
         }
 
@@ -4081,10 +4081,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;
 }