From ce0a5fe14590b8d675b885fccd5f79d7ea17a302 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Tue, 21 Aug 2007 22:17:53 +0000
Subject: EFFECTIVE MERGE: svn merge -r 66133:68118
 svn+ssh://svn/svn/linden/branches/maintenance into release

Actual action: branched maintenance-r68118, merged in release, then copied result into release
---
 indra/newview/llagent.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llagent.cpp')

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 7ed11c1154..e12904ef43 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -5592,7 +5592,7 @@ void LLAgent::teleportCancel()
 		sendReliableMessage();
 	}	
 	gTeleportDisplay = FALSE;
-	gAgent.setTeleportState( LLAgent::TELEPORT_CANCELLING );
+	gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
 }
 
 
-- 
cgit v1.3