aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/skins/default
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-04-14 00:20:56 -0700
committerMcCabe Maxsted2010-04-14 00:20:56 -0700
commit834a60163bba95d53c297c791e49a597b87144f3 (patch)
tree0dc2c00c07be28940a72011ef9291cd817a2c0d5 /linden/indra/newview/skins/default
parentAdded prim media functions and new script functions from SL server 1.38.0 (diff)
parentfix bring help-f1 page under control of hippogridmanager (diff)
downloadmeta-impy-834a60163bba95d53c297c791e49a597b87144f3.zip
meta-impy-834a60163bba95d53c297c791e49a597b87144f3.tar.gz
meta-impy-834a60163bba95d53c297c791e49a597b87144f3.tar.bz2
meta-impy-834a60163bba95d53c297c791e49a597b87144f3.tar.xz
Merge commit 'armin/beta2-bugfixes' into 1.3-beta2bugfixes
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/notifications.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 9390fb5..df277ad 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -4130,7 +4130,7 @@ Add this Ability to '[ROLE_NAME]'?
4130 icon="alertmodal.tga" 4130 icon="alertmodal.tga"
4131 name="ClickOpenF1Help" 4131 name="ClickOpenF1Help"
4132 type="alertmodal"> 4132 type="alertmodal">
4133 Visit the [SECOND_LIFE] Support Website? (note: this is not an Imprudence Help site) 4133Visit the [GRID] Support Web site?
4134 <usetemplate 4134 <usetemplate
4135 ignoretext="When visiting the Support Website." 4135 ignoretext="When visiting the Support Website."
4136 name="okcancelignore" 4136 name="okcancelignore"
@@ -4140,6 +4140,13 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
4140 4140
4141 <notification 4141 <notification
4142 icon="alertmodal.tga" 4142 icon="alertmodal.tga"
4143 name="NoSupportUrl"
4144 type="alertmodal">
4145[GRID] has no link for support.
4146 </notification>
4147
4148 <notification
4149 icon="alertmodal.tga"
4143 name="ConfirmQuit" 4150 name="ConfirmQuit"
4144 type="alertmodal"> 4151 type="alertmodal">
4145 Are you sure you want to quit? 4152 Are you sure you want to quit?