From 369b8b4920bdfb4cd3ada5428df31dfcf1d88464 Mon Sep 17 00:00:00 2001
From: Cinder <cinder@sdf.org>
Date: Sat, 23 Jul 2016 22:33:30 -0500
Subject: [PATCH] Revert hot dog code
---
indra/newview/llagent.cpp | 9 ---------
indra/newview/llvoiceclient.cpp | 8 --------
indra/newview/llvoiceclient.h | 3 ---
indra/newview/llvoicevivox.cpp | 8 --------
indra/newview/llvoicevivox.h | 4 +---
5 files changed, 1 insertion(+), 31 deletions(-)
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 112bb4e3d2..15a3c3e0fe 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4024,10 +4024,6 @@ bool LLAgent::hasPendingTeleportRequest()
void LLAgent::startTeleportRequest()
{
LL_INFOS("Telport") << "Agent handling start teleport request." << LL_ENDL;
- if(LLVoiceClient::instanceExists())
- {
- LLVoiceClient::getInstance()->setHidden(TRUE);
- }
if (hasPendingTeleportRequest())
{
mTeleportCanceled.reset();
@@ -4083,11 +4079,6 @@ void LLAgent::handleTeleportFinished()
void LLAgent::handleTeleportFailed()
{
LL_WARNS("Teleport") << "Agent handling teleport failure!" << LL_ENDL;
- if(LLVoiceClient::instanceExists())
- {
- LLVoiceClient::getInstance()->setHidden(FALSE);
- }
-
setTeleportState(LLAgent::TELEPORT_NONE);
// Unlock the UI if the progress bar has been shown.
// gViewerWindow->setShowProgress(FALSE);
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 56c0910983..d568cb45e1 100755
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -161,14 +161,6 @@ void LLVoiceClient::userAuthorized(const std::string& user_id, const LLUUID &age
mVoiceModule->userAuthorized(user_id, agentID);
}
-void LLVoiceClient::setHidden(bool hidden)
-{
- if (mVoiceModule)
- {
- mVoiceModule->setHidden(hidden);
- }
-}
-
void LLVoiceClient::terminate()
{
if (mVoiceModule) mVoiceModule->terminate();
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index b05bcb23b7..13ea957297 100755
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -106,8 +106,6 @@ public:
virtual bool isVoiceWorking() const = 0; // connected to a voice server and voice channel
- virtual void setHidden(bool hidden)=0; // Hides the user from voice.
-
virtual const LLVoiceVersionInfo& getVersion()=0;
/////////////////////
@@ -346,7 +344,6 @@ public:
void setCaptureDevice(const std::string& name);
void setRenderDevice(const std::string& name);
- void setHidden(bool hidden);
const LLVoiceDeviceList& getCaptureDevices();
const LLVoiceDeviceList& getRenderDevices();
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 2440aeece5..edbe0caef6 100755
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -2473,14 +2473,6 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe
#endif
}
-void LLVivoxVoiceClient::setHidden(bool hidden)
-{
- mHidden = hidden;
-
- sendPositionAndVolumeUpdate();
- return;
-}
-
void LLVivoxVoiceClient::sendPositionAndVolumeUpdate(void)
{
std::ostringstream stream;
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index f32c7c975f..e02301b136 100755
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -745,8 +745,7 @@ private:
bool inSpatialChannel(void);
std::string getAudioSessionURI();
std::string getAudioSessionHandle();
-
- void setHidden(bool hidden); //virtual
+
void sendPositionAndVolumeUpdate(void);
void sendCaptureAndRenderDevices();
@@ -777,7 +776,6 @@ private:
bool mMuteMic;
bool mMuteMicDirty;
- bool mHidden; //Set to true during teleport to hide the agent's position.
// Set to true when the friends list is known to have changed.
bool mFriendsListDirty;
--
GitLab