summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-09-08 13:55:23 -0700
committerAura Linden <aura@lindenlab.com>2014-09-08 13:55:23 -0700
commite44dfc0a4eb2c1dc63592f8ced7e35debbbf6238 (patch)
tree364b801d095bb73dd7bb38ffa4170507a4504e8e /indra/newview
parent983ab95365cf45138aa05ab694c492fc141be2a8 (diff)
Fix position hiding on failed teleports on mac.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llagent.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 059f21e91e..43e2b22689 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -3873,6 +3873,11 @@ void LLAgent::handleTeleportFinished()
void LLAgent::handleTeleportFailed()
{
+ if(LLVoiceClient::instanceExists())
+ {
+ LLVoiceClient::getInstance()->setHidden(FALSE);
+ }
+
if (mTeleportRequest != NULL)
{
mTeleportRequest->setStatus(LLTeleportRequest::kFailed);