diff options
author | simon <none@none> | 2014-07-07 16:17:53 -0700 |
---|---|---|
committer | simon <none@none> | 2014-07-07 16:17:53 -0700 |
commit | bfa42c9e28075cb35f80e6fce7d1db0443027052 (patch) | |
tree | b4e209e91cd173473f3c2033487647c5eb8c6b5d /indra/newview/skins/default/xui/en/notifications.xml | |
parent | 114f7b5d0f46dfcbc9a94c1907e396b6e02700f6 (diff) | |
parent | 3e6698073cedc8b24068147cf6b7091f081ea125 (diff) |
Merge downstream code and become 3.7.12
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e3c062d170..0607576fe6 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -10289,6 +10289,17 @@ Cannot create large prims that intersect other players. Please re-try when othe name="okignore" yestext="OK"/> </notification> + + <notification + icon="alertmodal.tga" + name="DefaultObjectPermissions" + type="alert"> + There was a problem saving the default permissions due to the following reason: [REASON]. Please try setting the default permissions later. + <tag>fail</tag> + <usetemplate + name="okbutton" + yestext="OK"/> + </notification> <notification icon="alert.tga" |