From 21d5c3e85bbb3cdc556918c6699df768e6f01637 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 13 Nov 2010 01:54:21 -0700
Subject: Ported keyboard shortcut for align tool from Ascent, by Beeks. Has
 the followingrepercussions:

* CTRL-A while a prim is selected switches to the align tool
* CTRL-SHIFT-A while a prim is selected switches to the pack tool
* Area Object Search shortcut has been changed from CTRL-SHIFT-A to ALT-A
---
 linden/indra/newview/lltoolcomp.cpp                | 22 +++++++++++++++++++---
 .../skins/default/xui/en-us/floater_tools.xml      |  2 +-
 .../skins/default/xui/en-us/menu_viewer.xml        |  3 ++-
 3 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index 16e0136..7bf99f0 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -55,6 +55,7 @@
 #include "llagent.h"
 #include "llfloatertools.h"
 #include "llviewercontrol.h"
+#include "qtoolalign.h"
 
 const S32 BUTTON_HEIGHT = 16;
 const S32 BUTTON_WIDTH_SMALL = 32;
@@ -278,7 +279,12 @@ BOOL LLToolCompTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
 
 LLTool* LLToolCompTranslate::getOverrideTool(MASK mask)
 {
-	if (mask == MASK_CONTROL)
+	if (gKeyboard->getKeyDown('A') && 
+		((mask & MASK_CONTROL) || (mask == (MASK_CONTROL | MASK_SHIFT))))
+	{
+		return QToolAlign::getInstance();
+	}
+	else if (mask == MASK_CONTROL)
 	{
 		return LLToolCompRotate::getInstance();
 	}
@@ -397,7 +403,12 @@ BOOL LLToolCompScale::handleMouseUp(S32 x, S32 y, MASK mask)
 
 LLTool* LLToolCompScale::getOverrideTool(MASK mask)
 {
-	if (mask == MASK_CONTROL)
+	if (gKeyboard->getKeyDown('A') && 
+		((mask & MASK_CONTROL) || (mask == (MASK_CONTROL | MASK_SHIFT))))
+	{
+		return QToolAlign::getInstance();
+	}
+	else if (mask == MASK_CONTROL)
 	{
 		return LLToolCompRotate::getInstance();
 	}
@@ -597,7 +608,12 @@ BOOL LLToolCompRotate::handleMouseUp(S32 x, S32 y, MASK mask)
 
 LLTool* LLToolCompRotate::getOverrideTool(MASK mask)
 {
-	if (mask == (MASK_CONTROL | MASK_SHIFT))
+	if (gKeyboard->getKeyDown('A') && 
+		((mask & MASK_CONTROL) || (mask == (MASK_CONTROL | MASK_SHIFT))))
+	{
+		return QToolAlign::getInstance();
+	}
+	else if (mask == (MASK_CONTROL | MASK_SHIFT))
 	{
 		return LLToolCompScale::getInstance();
 	}
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 18e0274..c665563 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1364,7 +1364,7 @@
 		Drag to Move, Shift-Drag to Copy
 	</string>
   <string name="status_align">
-    Aligns objects along an axis, hold Shift to Pack 
+    CTRL-A to align on an axis, CTRL-Shift-A to Pack 
   </string>
 	<string name="status_modifyland">
 		Click and Hold to Modify Land
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 268ae2b..31e730a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -996,7 +996,8 @@
       <on_click function="ShowFloater" userdata="animation list" />
       <on_check function="FloaterVisible" userdata="animation list" />
     </menu_item_check>
-		<menu_item_check label="Area Object Search" name="Area Object Search" shortcut="control|shift|A">
+		<menu_item_check label="Area Object Search" name="Area Object Search" 
+                     shortcut="alt|A">
 			<on_click function="ShowFloater" userdata="areasearch" />
 			<on_check function="FloaterVisible" userdata="areasearch" />
     </menu_item_check>
-- 
cgit v1.1