summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-07-13 18:54:16 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-07-13 18:54:16 +0300
commitba1123e3e482fdd061095c1374a41f8d007fbc22 (patch)
tree499b01923892a406d306eadd4507e6d7a41b471b /indra/newview/skins/default/xui/en/notifications.xml
parent623dae525dc14a69322266e33421770431c34a66 (diff)
parentc3099df719274556fede1a57bc42e555e5c89fbb (diff)
Manual merge from default branch
Resolved conflicts in llpaneloutfitedit.cpp --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 04a8a02ecd..60d3fb708e 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5493,7 +5493,6 @@ If you stay in this region you will be logged out.
<notification
icon="notify.tga"
name="LoadWebPage"
- persist="true"
type="notify">
Load web page [URL]?
@@ -5593,7 +5592,6 @@ Grant this request?
<notification
icon="notify.tga"
name="ScriptDialog"
- persist="true"
type="notify">
[FIRST] [LAST]&apos;s &apos;[TITLE]&apos;
[MESSAGE]
@@ -5608,7 +5606,6 @@ Grant this request?
<notification
icon="notify.tga"
name="ScriptDialogGroup"
- persist="true"
type="notify">
[GROUPNAME]&apos;s &apos;[TITLE]&apos;
[MESSAGE]