diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-18 22:23:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-18 22:23:30 -0400 |
| commit | d7400ae60c0453e111357abfb09d8308adf8b721 (patch) | |
| tree | cfbbc175c4df5d0929ad923c5c52489b8d87fb75 /indra/llui/llnotifications.cpp | |
| parent | d500379cea865e4a6958eee82b5615ace61036c4 (diff) | |
| parent | 9cac312f57391792e9fce380c2c38ae4060ae1d7 (diff) | |
merge to pathfinding development branch
Diffstat (limited to 'indra/llui/llnotifications.cpp')
| -rw-r--r-- | indra/llui/llnotifications.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 8aa548b974..83fa6da863 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -1477,6 +1477,10 @@ bool LLNotifications::loadTemplates() { replaceFormText(notification.form_ref.form, "$canceltext", notification.form_ref.form_template.cancel_text); } + if(notification.form_ref.form_template.help_text.isProvided()) + { + replaceFormText(notification.form_ref.form, "$helptext", notification.form_ref.form_template.help_text); + } if(notification.form_ref.form_template.ignore_text.isProvided()) { replaceFormText(notification.form_ref.form, "$ignoretext", notification.form_ref.form_template.ignore_text); |