summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-10-15 17:38:56 -0700
committerRick Pasetto <rick@lindenlab.com>2009-10-15 17:38:56 -0700
commit9a7f79cbcf57c46e797d2e5626d534055f9a256d (patch)
tree91b8b420a1892377b60c64f813c20edc2486910a /indra/newview/skins/default
parent665bac16cef36e265829d6692959daacc9811451 (diff)
parent893fc8afa71bc5b7bbdc80d8d7520352e73205cb (diff)
Merge from remote repo
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml13
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index f141a909a8..4c90d9ee8a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -661,6 +661,19 @@ To place the media on only one face, choose Select Texture and click on the desi
<notification
icon="alertmodal.tga"
+ name="WhiteListInvalidatesHomeUrl"
+ type="alertmodal">
+Adding this entry to the whitelist will invalidate the home URL you
+specified for this instance of media. You are not allowed to do this
+so the entry cannot be added to the whitelist.
+ <usetemplate
+ name="okbutton"
+ yestext="Ok"/>
+ </notification>
+
+
+ <notification
+ icon="alertmodal.tga"
name="MustBeInParcel"
type="alertmodal">
You must be standing inside the land parcel to set its Landing Point.