diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-02 12:16:24 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-02 12:16:24 -0500 |
| commit | d629be01cb3136fb136b36c54b284446d8ab7599 (patch) | |
| tree | 766a24eb7e6a025f76c6a6e4b392284556ef36f1 /indra/newview/llmaniptranslate.cpp | |
| parent | bbe2bcf8a2cb0aec94be1838d83beaddd9355061 (diff) | |
| parent | c40ed43535164c3b80afd34bdb1de211eb023458 (diff) | |
Automated merge avp->avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llmaniptranslate.cpp')
| -rw-r--r-- | indra/newview/llmaniptranslate.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index 932a3d8a83..765b504afe 100644 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -1440,7 +1440,7 @@ void LLManipTranslate::renderSnapGuides() LLVector3 help_text_pos = selection_center_start + (snap_offset_meters_up * 3.f * mSnapOffsetAxis); const LLFontGL* big_fontp = LLFontGL::getFontSansSerif(); - std::string help_text = "Move mouse cursor over ruler to snap"; + std::string help_text = "Move mouse cursor over ruler"; LLColor4 help_text_color = LLColor4::white; help_text_color.mV[VALPHA] = clamp_rescale(mHelpTextTimer.getElapsedTimeF32(), sHelpTextVisibleTime, sHelpTextVisibleTime + sHelpTextFadeTime, line_alpha, 0.f); hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, mObjectSelection->getSelectType() == SELECT_TYPE_HUD); |