diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-05 15:12:12 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-05 15:12:12 -0700 |
| commit | a0a7b7ed16a9161b8060e8f32e5594356e5c7329 (patch) | |
| tree | 06809cac6cde316219cbcbf58a7381d907a9d5e6 /indra/newview/llagent.cpp | |
| parent | 6b3ca581e037d52e507a69d82fd6d900bd4641b7 (diff) | |
| parent | 9bfc1c3b1060f15990bba218795a1ef6009d1535 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index f434782977..37d1bd15e1 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3231,7 +3231,7 @@ bool LLAgent::teleportCore(bool is_local) // 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. -// gVoiceClient->leaveChannel(); +// LLVoiceClient::getInstance()->leaveChannel(); return true; } @@ -3375,7 +3375,7 @@ void LLAgent::setTeleportState(ETeleportState state) if (mTeleportState == TELEPORT_MOVING) { // We're outa here. Save "back" slurl. - mTeleportSourceSLURL = LLAgentUI::buildSLURL(); + LLAgentUI::buildSLURL(mTeleportSourceSLURL); } else if(mTeleportState == TELEPORT_ARRIVING) { |