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/llfloatertools.cpp                        | 1 +
 linden/indra/newview/lltoolface.cpp                            | 1 +
 linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | 3 +++
 3 files changed, 5 insertions(+)

(limited to 'linden')

diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index e22de66..2bf4b31 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["selectface"] = getString("status_selectface");
 	mStatusText["align"] = getString("status_align");
 	mStatusText["modifyland"] = getString("status_modifyland");
 	mStatusText["camera"] = getString("status_camera");
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);
 }
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 3f476cf..db7e75e 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
@@ -1366,6 +1366,9 @@
   <string name="status_align">
     CTRL-A to align on an axis, CTRL-Shift-A to Pack 
   </string>
+	<string name="status_selectface">
+		Click to selet a Face for texturing
+	</string>
 	<string name="status_modifyland">
 		Click and Hold to Modify Land
 	</string>
-- 
cgit v1.1