From cb6f9f55ab0032e943e5c46ba95d17214895aaa7 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 2 Nov 2009 19:45:36 -0600
Subject: "Go Here" in pie menu no longer asks for confirmation.

Double-click still does, though.
---
 linden/indra/newview/lltoolpie.cpp    |  4 ++--
 linden/indra/newview/llviewermenu.cpp | 18 +++++++++++++++++-
 linden/indra/newview/llviewermenu.h   |  1 +
 3 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index b32169d..cda76d9 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/indra/newview/lltoolpie.cpp
@@ -681,7 +681,7 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
 		if (mPick.mPickType == LLPickInfo::PICK_LAND
 			&& !mPick.mPosGlobal.isExactlyZero())
 		{
-			handle_go_to();
+			handle_go_to_confirm();
 			return TRUE;
 		}
 		else if (mPick.mObjectID.notNull()
@@ -691,7 +691,7 @@ BOOL LLToolPie::handleDoubleClick(S32 x, S32 y, MASK mask)
 			if(mPick.getObject().notNull() && mPick.getObject()->isHUDAttachment())
 				return FALSE;
 
-			handle_go_to();
+			handle_go_to_confirm();
 			return TRUE;
 		}
 	}
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index d0e326c..bd8b6ab 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -2384,7 +2384,7 @@ class LLObjectImportUpload : public view_listener_t
 	}
 };
 
-bool handle_go_to()
+bool handle_go_to_confirm()
 {
 // [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
 	if ( (rlv_handler_t::isEnabled()) && gAgent.forwardGrabbed() && (gRlvHandler.hasLockedAttachment()) )
@@ -2404,6 +2404,22 @@ bool handle_go_to()
 	return true;
 }
 
+
+bool handle_go_to()
+{
+// [RLVa:KB] - Checked: 2009-07-06 (RLVa-1.0.0c)
+	if ( (rlv_handler_t::isEnabled()) && gAgent.forwardGrabbed() && (gRlvHandler.hasLockedAttachment()) )
+	{
+		return true;
+	}
+// [/RLVa:KB]
+
+	handle_go_to_callback( 0, (void*)LLToolPie::getInstance() );
+
+	return true;
+}
+
+
 //static
 void handle_go_to_callback(S32 option, void *userdata)
 {
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index c4a88a2..a2f953c 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -106,6 +106,7 @@ void handle_toggle_flycam();
 bool handle_sit_or_stand();
 bool handle_give_money_dialog();
 bool handle_object_open();
+bool handle_go_to_confirm();
 bool handle_go_to();
 
 // Export to XML or Collada
-- 
cgit v1.1