1 files changed, 9 insertions, 10 deletions

diff --git a/linden/indra/newview/qtoolalign.cpp b/linden/indra/newview/qtoolalign.cpp
index 3fe31f7..b4944fe 100644
--- a/linden/indra/newview/qtoolalign.cpp
+++ b/linden/indra/newview/qtoolalign.cpp
@@ -36,7 +36,7 @@ const F32 MANIPULATOR_SELECT_SIZE = 20.0;
 
 
 QToolAlign::QToolAlign()
-:       LLTool(std::string("Align"))
+:       LLToolComposite(std::string("Align"))
 {
 }
 
@@ -46,7 +46,6 @@ QToolAlign::~QToolAlign()
 }
 
 
-
 BOOL QToolAlign::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         if (mHighlightedAxis != -1)
@@ -62,6 +61,11 @@ BOOL QToolAlign::handleMouseDown(S32 x, S32 y, MASK mask)
 }
 
 
+BOOL QToolAlign::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+        return TRUE;
+}
+
 
 void QToolAlign::pickCallback(const LLPickInfo& pick_info)
 {
@@ -95,7 +99,7 @@ void QToolAlign::pickCallback(const LLPickInfo& pick_info)
         }
         else
         {
-                if (!(pick_info.mKeyMask == MASK_SHIFT))
+                if (!(pick_info.mKeyMask & MASK_SHIFT))
                 {
                         LLSelectMgr::getInstance()->deselectAll();
                 }
@@ -105,7 +109,6 @@ void QToolAlign::pickCallback(const LLPickInfo& pick_info)
 }
 
 
-
 void QToolAlign::handleSelect()
 {
         // no parts, please
@@ -207,7 +210,6 @@ BOOL QToolAlign::handleHover(S32 x, S32 y, MASK mask)
 }
 
 
-
 void setup_transforms_bbox(LLBBox bbox)
 {
         // translate to center
@@ -242,6 +244,7 @@ void render_bbox(LLBBox bbox)
         gGL.popMatrix();
 }
 
+
 void render_cone_bbox(LLBBox bbox)
 {
         glMatrixMode(GL_MODELVIEW);
@@ -256,7 +259,6 @@ void render_cone_bbox(LLBBox bbox)
 }
 
 
-
 // the selection bbox isn't axis aligned, so we must construct one
 // should this be cached in the selection manager?  yes.
 LLBBox get_selection_axis_aligned_bbox()
@@ -288,7 +290,6 @@ LLBBox get_selection_axis_aligned_bbox()
 }
 
 
-
 void QToolAlign::computeManipulatorSize()
 {
         if (LLSelectMgr::getInstance()->getSelection()->getSelectType() == SELECT_TYPE_HUD)
@@ -407,6 +408,7 @@ void QToolAlign::render()
         }
 }
 
+
 // only works for our specialized (AABB, position centered) bboxes
 BOOL bbox_overlap(LLBBox bbox1, LLBBox bbox2)
 {
@@ -422,7 +424,6 @@ BOOL bbox_overlap(LLBBox bbox1, LLBBox bbox2)
 }
 
 
-
 // used to sort bboxes before packing
 class BBoxCompare
 {
@@ -598,5 +599,3 @@ void QToolAlign::align()
         
         LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION);
 }
-
-