diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-02-04 14:43:29 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-02-04 14:43:29 -0500 |
commit | a93eb24e39458576475482b50ee0016fc4df50f9 (patch) | |
tree | b9f5287712f154215695c5152f3d24c391ca2ae7 /indra/newview/skins/default/xui/en/notifications.xml | |
parent | c58e152236abfc1c414eb6c64783334ca9555b58 (diff) | |
parent | fed6c9eb0fa58559c13729b65ecee181f58f3c69 (diff) |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 5c37ef75b5..d16474873f 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -405,6 +405,19 @@ Do you wish to proceed? <notification icon="alertmodal.tga" + name="JoinGroupNoCost" + type="alertmodal"> +You are Joining group [NAME]. +Do you wish to proceed? + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="Join"/> + </notification> + + + <notification + icon="alertmodal.tga" name="JoinGroupCannotAfford" type="alertmodal"> Joining this group costs L$[COST]. @@ -1519,7 +1532,7 @@ Your search terms were too short so no search was performed. icon="alertmodal.tga" name="CouldNotTeleportReason" type="alertmodal"> -Could not teleport. +Teleport failed. [REASON] </notification> |