From 8d53e655a6e81e4655cae2ebad46a57cdcf62ac5 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Tue, 14 Sep 2010 02:34:39 +0200
Subject: Prevent double-click teleport when double-clicking touch-scripted
 objects or objects with non-default click action (sit, buy, etc.)

---
 linden/indra/newview/lltoolpie.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 2887515..2b63a24 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -727,6 +727,19 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
 			LL_DEBUGS("DoubleClicks") << "Double clicked other Avatar" << LL_ENDL;
 			return FALSE;// or what about open profile or IM session or ...
 		}
+
+		if (final_click_action(object))
+		{
+			LL_DEBUGS("DoubleClicks") << "Double clicked an object with a click action" << LL_ENDL;
+			return FALSE;
+		}
+
+		LLViewerObject* parent = object->getRootEdit();
+		if (object->flagHandleTouch() || (parent && parent->flagHandleTouch()))
+		{
+			LL_DEBUGS("DoubleClicks") << "Double clicked a touch-scripted object" << LL_ENDL;
+			return FALSE;
+		}
 	}
 
 	std::string action = gSavedSettings.getString("DoubleClickAction");
-- 
cgit v1.1