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

2 files changed, 3 insertions, 2 deletions

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>