diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-05 01:17:48 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-05 01:17:48 +0200 |
| commit | 0acc373a352093fdc1cf370f01b1fa388dd8e014 (patch) | |
| tree | f14af1240fe14265ec95f6b73b938fa36fdbfd31 /indra/newview/skins/default/xui | |
| parent | 23ca3a1f2ce113cde94bdfea5fd794ecf808535e (diff) | |
| parent | f352c81f11f26dfe9fe2cf494407045bab41dabf (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 3ae9b206a4..88c02fc84e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -9708,14 +9708,6 @@ No room to sit here, try another spot. <notification icon="alertmodal.tga" - name="AutopilotCanceled" - type="notify"> - <tag>fail</tag> -Autopilot canceled - </notification> - - <notification - icon="alertmodal.tga" name="ClaimObjectFailedNoPermission" type="notify"> <tag>fail</tag> @@ -10028,4 +10020,15 @@ Cannot create large prims that intersect other players. Please re-try when othe yestext="OK"/> </notification> + <notification + icon="alert.tga" + name="PreferenceChatPathChanged" + type="alert"> + Unable to move files. Restored previous path. + <usetemplate + ignoretext="Unable to move files. Restored previous path." + name="okignore" + yestext="OK"/> + </notification> + </notifications> |