Merged from q/viewer-release

1 files changed, 1 insertions, 22 deletions

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index aca3b750c8..20a2a7d954 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1397,8 +1397,7 @@ Unable to encode file: [FILE]
    icon="alertmodal.tga"
    name="CorruptedProtectedDataStore"
    type="alertmodal">
-  We are unable to read your protected data so it is being reset.
-   This may happen when you change network setup.
+   We can't fill in your username and password.  This may happen when you change network setup
 
     <usetemplate
      name="okbutton"
@@ -4519,18 +4518,6 @@ Uploading in-world and web site snapshots...
   </notification>
 
   <notification
-   icon="alertmodal.tga"
-   name="UploadConfirmation"
-   type="alertmodal">
-Uploading costs L$[AMOUNT].
-Do you wish to proceed?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Upload"/>
-  </notification>
-
-  <notification
    icon="notify.tga"
    name="UploadPayment"
    persist="true"
@@ -5528,14 +5515,6 @@ Failed to find [TYPE] named [DESC] in database.
 
   <notification
    icon="notify.tga"
-   name="ShareToWebFailed"
-   persist="true"
-   type="notify">
-    Failed to upload image to web.
-  </notification>
-  
-  <notification
-   icon="notify.tga"
    name="InvalidWearable"
    persist="true"
    type="notify">