diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-31 14:55:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-31 14:55:15 -0400 |
| commit | df93749819c503a66bc0ad34aeb1c7bed3746df2 (patch) | |
| tree | 9bc6ae94c08fd881b8a73bfc0bc4ea79169ebf9e /indra/llui/llnotifications.cpp | |
| parent | 764d1e3cafa3e86f1f44a4c2bec0705879b9da38 (diff) | |
| parent | b8bac66a0f8c392a221ad2c64611e2a55de82339 (diff) | |
merge up to latest viewer-development
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 09480968a6..629eef2c3b 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -1488,6 +1488,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); |