3 files changed, 6 insertions, 1 deletions

diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 4e9a837..0cb35e3 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -393,6 +393,7 @@ BOOL	LLFloaterTools::postBuild()
         mStatusText["rotate"] = getString("status_rotate");
         mStatusText["scale"] = getString("status_scale");
         mStatusText["move"] = getString("status_move");
+        mStatusText["align"] = getString("status_align");
         mStatusText["modifyland"] = getString("status_modifyland");
         mStatusText["camera"] = getString("status_camera");
         mStatusText["grab"] = getString("status_grab");
diff --git a/linden/indra/newview/qtoolalign.cpp b/linden/indra/newview/qtoolalign.cpp
index d7f7ad0..ac6a0bb 100644
--- a/linden/indra/newview/qtoolalign.cpp
+++ b/linden/indra/newview/qtoolalign.cpp
@@ -110,8 +110,9 @@ void QToolAlign::handleSelect()
 {
         // no parts, please
 
-        llwarns << "in select" << llendl;
+        //llwarns << "in select" << llendl;
         LLSelectMgr::getInstance()->promoteSelectionToRoot();
+        gFloaterTools->setStatusText("align");
 }
 
 
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 fd9ec99..18e0274 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
@@ -1363,6 +1363,9 @@
         <string name="status_move">
                 Drag to Move, Shift-Drag to Copy
         </string>
+  <string name="status_align">
+    Aligns objects along an axis, hold Shift to Pack 
+  </string>
         <string name="status_modifyland">
                 Click and Hold to Modify Land
         </string>