From 73b8ee092e6f8a450e5bf71c43a0362c4986a005 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sat, 11 Jul 2009 12:25:27 +0200
Subject: Teleport by double clicking into the viewer window. Port and bugfix
 of cv port of emerald greenlife viewer feature. TODO: find a nice place in
 prefs to switch off (defaults to on). (cherry picked from commit
 86e186e40f6a128abab1c3a44f33520508b37f16)

---
 linden/indra/newview/lltoolpie.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/lltoolpie.cpp')

diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 27d1c4c..7f3bd82 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -635,7 +635,7 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
 		llinfos << "LLToolPie handleDoubleClick (becoming mouseDown)" << llendl;
 	}
 
-	if (gSavedSettings.getBOOL("DoubleClickAutoPilot"))
+	if (gSavedSettings.getBOOL("DoubleClickAutoPilot") || gSavedSettings.getBOOL("DoubleClickTeleport"))
 	{
 		if (mPick.mPickType == LLPickInfo::PICK_LAND
 			&& !mPick.mPosGlobal.isExactlyZero())
-- 
cgit v1.1