From 5ce477c7cc1b6a6a4d3210e5a5fc990bca2fab28 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 9 Jun 2012 02:28:42 -0500
Subject: [PATCH] Removed redundant double-click-teleport logic.

---
 indra/newview/lltoolpie.cpp    | 50 +++++-----------------------------
 indra/newview/llviewermenu.cpp | 50 +++++++++++++---------------------
 2 files changed, 26 insertions(+), 74 deletions(-)

diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 9b3a87d0e..bacfa4938 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -779,38 +779,26 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
 		llinfos << "LLToolPie handleDoubleClick (becoming mouseDown)" << llendl;
 	}
 
-	if (gSavedSettings.getBOOL("DoubleClickAutoPilot") || gSavedSettings.getBOOL("DoubleClickTeleport"))
+	if (gSavedSettings.getBOOL("DoubleClickAutoPilot"))
 	{
-		if (mPick.mPickType == LLPickInfo::PICK_LAND
-			&& !mPick.mPosGlobal.isExactlyZero())
+		if ((mPick.mPickType == LLPickInfo::PICK_LAND && !mPick.mPosGlobal.isExactlyZero()) ||
+			(mPick.mObjectID.notNull()  && !mPick.mPosGlobal.isExactlyZero()))
 		{
 			handle_go_to();
 			return TRUE;
 		}
-		else if (mPick.mObjectID.notNull()
-				 && !mPick.mPosGlobal.isExactlyZero())
-		{
-			// Hit an object
-			// Do not go to attachments...
-			if (mPick.getObject() && !mPick.getObject()->isHUDAttachment())
-			{
-				// HACK: Call the last hit position the point we hit on the object
-				//gLastHitPosGlobal += gLastHitObjectOffset;
-				handle_go_to();
-				return TRUE;
-			}
-		}
-	} else
-	/* code added to support double click teleports */
-	if (gSavedSettings.getBOOL("DoubleClickTeleport"))
+	}
+	else if (gSavedSettings.getBOOL("DoubleClickTeleport"))
 	{
 		LLViewerObject* objp = mPick.getObject();
 		LLViewerObject* parentp = objp ? objp->getRootEdit() : NULL;
+
 		bool is_in_world = mPick.mObjectID.notNull() && objp && !objp->isHUDAttachment();
 		bool is_land = mPick.mPickType == LLPickInfo::PICK_LAND;
 		bool pos_non_zero = !mPick.mPosGlobal.isExactlyZero();
 		bool has_touch_handler = (objp && objp->flagHandleTouch()) || (parentp && parentp->flagHandleTouch());
 		bool has_click_action = final_click_action(objp);
+
 		if (pos_non_zero && (is_land || (is_in_world && !has_touch_handler && !has_click_action)))
 		{
 			LLVector3d pos = mPick.mPosGlobal;
@@ -821,30 +809,6 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
 	}
 
 	return FALSE;
-
-	/* JC - don't do go-there, because then double-clicking on physical
-	objects gets you into trouble.
-
-	// If double-click on object or land, go there.
-	LLViewerObject *object = gViewerWindow->getLastPick().getObject();
-	if (object)
-	{
-		if (object->isAvatar())
-		{
-			LLFloaterAvatarInfo::showFromAvatar(object->getID());
-		}
-		else
-		{
-			handle_go_to(NULL);
-		}
-	}
-	else if (!gLastHitPosGlobal.isExactlyZero())
-	{
-		handle_go_to(NULL);
-	}
-
-	return TRUE;
-	*/
 }
 
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index e7867655c..634e70e0b 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2751,44 +2751,32 @@ bool handle_go_to()
 */
 // [/RLVa:KB]
 
-	// JAMESDEBUG try simulator autopilot
+	// try simulator autopilot
 	std::vector<std::string> strings;
 	std::string val;
 	LLVector3d pos = LLToolPie::getInstance()->getPick().mPosGlobal;
-	if (gSavedSettings.getBOOL("DoubleClickTeleport")
-		)
+	val = llformat("%g", pos.mdV[VX]);
+	strings.push_back(val);
+	val = llformat("%g", pos.mdV[VY]);
+	strings.push_back(val);
+	val = llformat("%g", pos.mdV[VZ]);
+	strings.push_back(val);
+	send_generic_message("autopilot", strings);
+
+	LLViewerParcelMgr::getInstance()->deselectLand();
+
+	if (isAgentAvatarValid() && !gSavedSettings.getBOOL("AutoPilotLocksCamera"))
 	{
-		LLVector3d hips_offset(0.0f, 0.0f, 1.2f);
-		gAgent.teleportViaLocation(pos + hips_offset);
+		gAgentCamera.setFocusGlobal(gAgentCamera.getFocusTargetGlobal(), gAgentAvatarp->getID());
 	}
-	else
+	else 
 	{
-		// JAMESDEBUG try simulator autopilot
-		std::vector<std::string> strings;
-		std::string val;
-		val = llformat("%g", pos.mdV[VX]);
-		strings.push_back(val);
-		val = llformat("%g", pos.mdV[VY]);
-		strings.push_back(val);
-		val = llformat("%g", pos.mdV[VZ]);
-		strings.push_back(val);
-		send_generic_message("autopilot", strings);
-
-		LLViewerParcelMgr::getInstance()->deselectLand();
-
-		if (gAgentAvatarp && !gSavedSettings.getBOOL("AutoPilotLocksCamera"))
-		{
-			gAgentCamera.setFocusGlobal(gAgentCamera.getFocusTargetGlobal(), gAgentAvatarp->getID());
-		}
-		else 
-		{
-			// Snap camera back to behind avatar
-			gAgentCamera.setFocusOnAvatar(TRUE, ANIMATE);
-		}
-
-		// Could be first use
-		LLFirstUse::useGoTo();
+		// Snap camera back to behind avatar
+		gAgentCamera.setFocusOnAvatar(TRUE, ANIMATE);
 	}
+
+	// Could be first use
+	LLFirstUse::useGoTo();
 	return true;
 }