From 47910c5c5a64bff26e87161994be8e5d70c96eaf Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 11 May 2013 22:50:45 +1000
Subject: Add descriptive text for the face select tool.

It was missing any, and ended up with text from the last tool selected.
---
 linden/indra/newview/lltoolface.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'linden/indra/newview/lltoolface.cpp')

diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp
index 735ecd9..51a4561 100644
--- a/linden/indra/newview/lltoolface.cpp
+++ b/linden/indra/newview/lltoolface.cpp
@@ -156,6 +156,7 @@ void LLToolFace::pickCallback(const LLPickInfo& pick_info)
 
 void LLToolFace::handleSelect()
 {
+	gFloaterTools->setStatusText("selectface");
 	// From now on, draw faces
 	LLSelectMgr::getInstance()->setTEMode(TRUE);
 }
-- 
cgit v1.1


From f4d49c31da1bdc3e9072365c1f54fce5b964dafc Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 25 May 2013 23:22:31 +1000
Subject: Fix Align tool conflicts with Edit Linked Parts -
 http://redmine.kokuaviewer.org/issues/948

The new hot keys are -
Ctrl-Shift-P for position (Ctrl-Alt-P was taken).
Ctrl-Alt-F for face selection.
Ctrl-Alt-M for align, and Ctrl-Alt-Shift-M for pack.

Also fixed things so they all work all the time, and refactored common code.
---
 linden/indra/newview/lltoolface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linden/indra/newview/lltoolface.cpp')

diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp
index 51a4561..834bf76 100644
--- a/linden/indra/newview/lltoolface.cpp
+++ b/linden/indra/newview/lltoolface.cpp
@@ -57,7 +57,7 @@
 //
 
 LLToolFace::LLToolFace()
-:	LLTool(std::string("Texture"))
+:	LLToolComposite(std::string("Texture"))
 { }
 
 
-- 
cgit v1.1