diff options
author | David Walter Seikel | 2013-05-11 22:50:45 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-05-11 22:50:45 +1000 |
commit | 47910c5c5a64bff26e87161994be8e5d70c96eaf (patch) | |
tree | f25bf3e4f1b1e96e61a1fcad657375a8ef9f91e9 /linden/indra | |
parent | Fix http://redmine.kokuaviewer.org/issues/944 - Shadow Frustra missing from A... (diff) | |
download | meta-impy-47910c5c5a64bff26e87161994be8e5d70c96eaf.zip meta-impy-47910c5c5a64bff26e87161994be8e5d70c96eaf.tar.gz meta-impy-47910c5c5a64bff26e87161994be8e5d70c96eaf.tar.bz2 meta-impy-47910c5c5a64bff26e87161994be8e5d70c96eaf.tar.xz |
Add descriptive text for the face select tool.
It was missing any, and ended up with text from the last tool selected.
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/newview/llfloatertools.cpp | 1 | ||||
-rw-r--r-- | linden/indra/newview/lltoolface.cpp | 1 | ||||
-rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | 3 |
3 files changed, 5 insertions, 0 deletions
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() | |||
393 | mStatusText["rotate"] = getString("status_rotate"); | 393 | mStatusText["rotate"] = getString("status_rotate"); |
394 | mStatusText["scale"] = getString("status_scale"); | 394 | mStatusText["scale"] = getString("status_scale"); |
395 | mStatusText["move"] = getString("status_move"); | 395 | mStatusText["move"] = getString("status_move"); |
396 | mStatusText["selectface"] = getString("status_selectface"); | ||
396 | mStatusText["align"] = getString("status_align"); | 397 | mStatusText["align"] = getString("status_align"); |
397 | mStatusText["modifyland"] = getString("status_modifyland"); | 398 | mStatusText["modifyland"] = getString("status_modifyland"); |
398 | mStatusText["camera"] = getString("status_camera"); | 399 | 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) | |||
156 | 156 | ||
157 | void LLToolFace::handleSelect() | 157 | void LLToolFace::handleSelect() |
158 | { | 158 | { |
159 | gFloaterTools->setStatusText("selectface"); | ||
159 | // From now on, draw faces | 160 | // From now on, draw faces |
160 | LLSelectMgr::getInstance()->setTEMode(TRUE); | 161 | LLSelectMgr::getInstance()->setTEMode(TRUE); |
161 | } | 162 | } |
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 @@ | |||
1366 | <string name="status_align"> | 1366 | <string name="status_align"> |
1367 | CTRL-A to align on an axis, CTRL-Shift-A to Pack | 1367 | CTRL-A to align on an axis, CTRL-Shift-A to Pack |
1368 | </string> | 1368 | </string> |
1369 | <string name="status_selectface"> | ||
1370 | Click to selet a Face for texturing | ||
1371 | </string> | ||
1369 | <string name="status_modifyland"> | 1372 | <string name="status_modifyland"> |
1370 | Click and Hold to Modify Land | 1373 | Click and Hold to Modify Land |
1371 | </string> | 1374 | </string> |