1 files changed, 6 insertions, 2 deletions

diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index fc72467..6744faf 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -84,7 +84,7 @@
 #include "llvograss.h"
 #include "llvotree.h"
 #include "lluictrlfactory.h"
-
+#include "qtoolalign.h"
 #include "hippoLimits.h"
 
 // Globals
@@ -273,6 +273,8 @@ BOOL	LLFloaterTools::postBuild()
         childSetCommitCallback("radio stretch",commit_select_tool,LLToolCompScale::getInstance());
         mRadioSelectFace = getChild<LLCheckBoxCtrl>("radio select face");
         childSetCommitCallback("radio select face",commit_select_tool,LLToolFace::getInstance());
+        mRadioAlign = getChild<LLCheckBoxCtrl>("radio align");
+        childSetCommitCallback("radio align",commit_select_tool,QToolAlign::getInstance());
         mCheckSelectIndividual = getChild<LLCheckBoxCtrl>("checkbox edit linked parts");
         childSetValue("checkbox edit linked parts",(BOOL)gSavedSettings.getBOOL("EditLinkedParts"));
         childSetCommitCallback("checkbox edit linked parts",commit_select_component,this);
@@ -698,6 +700,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                                                 tool == LLToolCompScale::getInstance() ||
                                                 tool == LLToolFace::getInstance() ||
                                                 tool == LLToolIndividual::getInstance() ||
+                                                tool == QToolAlign::getInstance() ||
                                                 tool == LLToolPipette::getInstance();
 
         mBtnEdit        ->setToggleState( edit_visible );
@@ -720,6 +723,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
         mRadioPosition  ->set( tool == LLToolCompTranslate::getInstance() );
         mRadioRotate    ->set( tool == LLToolCompRotate::getInstance() );
         mRadioStretch   ->set( tool == LLToolCompScale::getInstance() );
+        mRadioAlign->set( tool == QToolAlign::getInstance() );
 
         if (mComboGridMode) 
         {
@@ -927,7 +931,7 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask)
                 childSetVisible("Strength:", land_visible);
         }
 
-        if (gSavedSettings.getBOOL("EditLinkedParts"))
+        if (gSavedSettings.getBOOL("EditLinkedParts") && LLSelectMgr::getInstance()->getEditSelection()->getObjectCount() == 1)
         {
                 childSetVisible("link_num", !land_visible);
         }