Merged in lindenlab/viewer-release

1 files changed, 11 insertions, 7 deletions

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 053c041849..f72767cceb 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -326,6 +326,16 @@ Initialization with the Marketplace failed because of a system or network error.
         name="okbutton"
         yestext="OK"/>
     </notification>
+  
+    <notification
+        icon="OutboxStatus_Error"
+        name="MyOutfitsPasteFailed"
+        type="alertmodal">
+       One or more items can't be used inside "My outfits"
+      <usetemplate
+        name="okbutton"
+        yestext="OK"/>
+    </notification>
     
     <notification
         icon="OutboxStatus_Error"
@@ -1775,13 +1785,6 @@ Visit [_URL] for more information?
 
   <notification
    icon="alertmodal.tga"
-   name="RunLauncher"
-   type="alertmodal">
-     Please do not directly run the viewer executable. Update any existing shortcuts to run SL_Launcher instead.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
    name="OldGPUDriver"
    type="alertmodal">
      There is likely a newer driver for your graphics chip.  Updating graphics drivers can substantially improve performance.
@@ -2393,6 +2396,7 @@ Your search terms were too short so no search was performed.
    icon="alertmodal.tga"
    name="CouldNotTeleportReason"
    type="alertmodal">
+    <unique/>
 Teleport failed.
 [REASON]
   <tag>fail</tag>