summaryrefslogtreecommitdiff
path: root/indra/llui/llnotifications.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2012-08-17 08:07:15 -0700
committerAura Linden <aura@lindenlab.com>2012-08-17 08:07:15 -0700
commitefdcf045b064335aa180f03bae58916af19e2169 (patch)
tree4ca0be04bf1688b728b40be0d6b4221956127918 /indra/llui/llnotifications.cpp
parent56298eed3d8ae586ab2ae4c7b8dcf53eeede7394 (diff)
parent7204593ec3f6fca63c32bcb8cdcf9c356165d24e (diff)
Merged in from viewer-development.
Diffstat (limited to 'indra/llui/llnotifications.cpp')
-rw-r--r--indra/llui/llnotifications.cpp4
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);