diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-12-03 19:44:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-03 19:44:04 +0000 |
| commit | f41b7bb8dff075d8c32ea03be407d20fe11e71f3 (patch) | |
| tree | 08bf4cb9354f975940b83cd695a2aa8bb8d74870 /indra/newview/llagent.cpp | |
| parent | d5eef2d8a6cc0d5855d68d0726565e07d46211b2 (diff) | |
-74901 (back out premature commit to release)
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 5aaf9d0097..39d4a3fc15 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -102,7 +102,6 @@ #include "lltoolpie.h" #include "lltoolview.h" #include "llui.h" // for make_ui_sound -#include "llurldispatcher.h" #include "llviewercamera.h" #include "llviewerinventory.h" #include "llviewermenu.h" @@ -905,24 +904,6 @@ const LLHost& LLAgent::getRegionHost() const } } -//----------------------------------------------------------------------------- -// getSLURL() -// returns empty() if getRegion() == NULL -//----------------------------------------------------------------------------- -std::string LLAgent::getSLURL() const -{ - std::string slurl; - LLViewerRegion *regionp = getRegion(); - if (regionp) - { - LLVector3d agentPos = getPositionGlobal(); - S32 x = llround( (F32)fmod( agentPos.mdV[VX], (F64)REGION_WIDTH_METERS ) ); - S32 y = llround( (F32)fmod( agentPos.mdV[VY], (F64)REGION_WIDTH_METERS ) ); - S32 z = llround( (F32)agentPos.mdV[VZ] ); - slurl = LLURLDispatcher::buildSLURL(regionp->getName(), x, y, z); - } - return slurl; -} //----------------------------------------------------------------------------- // inPrelude() @@ -1040,7 +1021,7 @@ void LLAgent::slamLookAt(const LLVector3 &look_at) //----------------------------------------------------------------------------- // getPositionGlobal() //----------------------------------------------------------------------------- -const LLVector3d &LLAgent::getPositionGlobal() const +const LLVector3d &LLAgent::getPositionGlobal() { if (!mAvatarObject.isNull() && !mAvatarObject->mDrawable.isNull()) { @@ -5802,11 +5783,6 @@ void LLAgent::setTeleportState(ETeleportState state) { LLFloaterSnapshot::hide(0); } - if (mTeleportState == TELEPORT_MOVING) - { - // We're outa here. Save "back" slurl. - mTeleportSourceSLURL = getSLURL(); - } } void LLAgent::fidget() |