From bbf1f41550945ff25cd2f021b42c235702941ae1 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 13 Nov 2010 00:41:25 -0700
Subject: Added some status text for the new align tool
---
linden/indra/newview/llfloatertools.cpp | 1 +
linden/indra/newview/qtoolalign.cpp | 3 ++-
linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | 3 +++
3 files changed, 6 insertions(+), 1 deletion(-)
(limited to 'linden/indra')
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 @@
Drag to Move, Shift-Drag to Copy
+
+ Aligns objects along an axis, hold Shift to Pack
+
Click and Hold to Modify Land
--
cgit v1.1