From 4be05b59e1cf69fda6552271df704f118adc5c8c Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sun, 16 Feb 2014 03:30:45 +0100
Subject: [PATCH] Disable bridge-supported teleport for the time being

---
 indra/newview/llagent.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index da1ebff985..55fe78293a 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -4723,10 +4723,10 @@ void LLAgent::doTeleportViaLocation(const LLVector3d& pos_global)
 		sendReliableMessage();
 	}
 // <FS:TT> Client LSL Bridge
-	if (gSavedSettings.getBOOL("UseLSLBridge") && isLocal)
-	{
-		teleportBridgeGlobal(pos_global);
-	}
+	//if (gSavedSettings.getBOOL("UseLSLBridge") && isLocal)
+	//{
+	//	teleportBridgeGlobal(pos_global);
+	//}
 // </FS:TT>
 }
 
@@ -4763,13 +4763,13 @@ void LLAgent::doTeleportViaLocationLookAt(const LLVector3d& pos_global)
 	teleportRequest(region_handle, pos_local, getTeleportKeepsLookAt());
 
 // <FS:TT> Client LSL Bridge
-	if (gSavedSettings.getBOOL("UseLSLBridge"))
-	{
-		if (region_handle == to_region_handle(getPositionGlobal()))
-		{
-			teleportBridgeLocal(pos_local);
-		}
-	}
+	//if (gSavedSettings.getBOOL("UseLSLBridge"))
+	//{
+	//	if (region_handle == to_region_handle(getPositionGlobal()))
+	//	{
+	//		teleportBridgeLocal(pos_local);
+	//	}
+	//}
 // </FS:TT>
 }