MAINT-5831: If there is a teleport request active and it has failed, teleport state will always return "None".

2 files changed, 8 insertions, 1 deletions

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 7f238a9a3b..157eb7d662 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4084,6 +4084,13 @@ void LLAgent::doTeleportViaLocationLookAt(const LLVector3d& pos_global)
 	teleportRequest(region_handle, pos_local, getTeleportKeepsLookAt());
 }
 
+LLAgent::ETeleportState	LLAgent::getTeleportState() const
+{
+    return (mTeleportRequest && (mTeleportRequest->getStatus() == LLTeleportRequest::kFailed)) ? 
+        TELEPORT_NONE : mTeleportState;
+}
+
+
 void LLAgent::setTeleportState(ETeleportState state)
 {
     if (mTeleportRequest && (state != TELEPORT_NONE) && (mTeleportRequest->getStatus() == LLTeleportRequest::kFailed))
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index d46973ddee..af8bd50c5d 100755
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -676,7 +676,7 @@ private:
 	// Teleport State
 	//--------------------------------------------------------------------
 public:
-	ETeleportState	getTeleportState() const 						{ return mTeleportState; }
+    ETeleportState	getTeleportState() const;
 	void			setTeleportState(ETeleportState state);
 private:
 	ETeleportState	mTeleportState;