From 1b793f5c10e9f74d66ccbf0d085e169e61e1a592 Mon Sep 17 00:00:00 2001
From: andreykproductengine <andreykproductengine@lindenlab.com>
Date: Fri, 31 May 2019 17:51:51 +0300
Subject: SL-11323 Bad merge fix and cleanup

---
 indra/newview/installers/windows/lang_en-us.nsi     | Bin 11488 -> 11434 bytes
 .../newview/skins/default/xui/en/notifications.xml  |   7 -------
 2 files changed, 7 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index fd4d340816..ea680f08e4 100644
Binary files a/indra/newview/installers/windows/lang_en-us.nsi and b/indra/newview/installers/windows/lang_en-us.nsi differ
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 053c041849..6e710f053c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -1773,13 +1773,6 @@ Visit [_URL] for more information?
   <tag>fail</tag>
   </notification>
 
-  <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"
-- 
cgit v1.2.3