diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-10 15:25:49 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-10 15:25:49 -0700 |
| commit | 2fd59393fc3420c37937731b08b5ee9e5f2f2ab6 (patch) | |
| tree | 9acb15bc211abd9cf8d173890ebe3b0d676dbc7e /indra/newview/llagent.cpp | |
| parent | 5a6237741608efb0ff669f422596178f93fbe120 (diff) | |
| parent | 60805b6f202b90b86d90d96eb7d09ae3355343eb (diff) | |
Automated 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 ddcaeb113d..db1a34e44a 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3236,7 +3236,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; } @@ -3380,7 +3380,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) { |