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

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

diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index fd4d340816abc487166547c2ec01d4a9ac58cf88..ea680f08e4252ea5aed981ec13ed961eb9cfc621 100644
GIT binary patch
delta 786
zcmYk4O=}ZT6o${FDM`jLjnmlXtI2elv`LlPLJMl51SMM0g$N?;Ds2-#+8Beekcz7y
zq6?+v?V^YaE8;?m)=oiiAzgGS(jOq2g+D;^1B&O~4lxYebKdiu^WG1pG4+0Gd2l6J
zSJah{r_c-skk{Q%m5R()l?_Ej&T&zyXh#&gj;x(eGx-}1V)T#`J1!rtI8A)(xF+fU
zTBA*8tS6nbN_zq4T=_P=#g-nuA8YQ2tbTVtvZL5|6o33q3~M@G`T}TpN-g$SebG8h
z-S!*AZ|}H0QEE{g^M`xzLz}g`gnrjXv)=g@$$Gu)vD`-Ab`@H5+$ZLK`Ob62#DybY
zS$Xs`lIQh@g6R{eC*nBWU1RmRdrWp}esL$$+VD?{r!b-Uz1GQ|l7g*N2s^#I-1{tW
zolypnpy(CRji14$Bsqk_ey&a;VkYrAeAQ}(&nk>2`ue#Xuqu5SAwNYgvkYM`7Dpyl
z6S=h)+de>P+a!cdHi?)Ac+-5NbgHCM8td^BJYnKP{3&~-6FIA%7;(5HBm?Wtqhlp1
zP?7GFK~;J{cc{dlL34DE%B*L&Qf6Y%P05N>m4D0r&?>TB8eS#0Z(L$#&=OB9ax8N+
z*h9?UvYpEui@cA)j<-3xOUF5{a95FcsPZay6l9JTIG^F!0v1xiUW0puTI5xnY>7t5
fBo)t71N_hpd8q+>8D0}_hW#PUsvRpR4we1^zEAS(

delta 715
zcmZ1#`5<zF8YAyS)n;y91}+8=wq{V6SSUR4kOENn;Y3E>$%TwZS;3N%&6(Umf|8SY
znB^vKVRC?RqM-7He6o`bSOq3eVJ-pbgYryR9zb}T4Or(f!X<1btFb2_@$RvgL5<lj
zs5rTdLk1`}kz*>DG@l&9c?!nj>VsRSJ$VDS$Yd?<7_d1Y-VP+WdCYv17x834<v=_a
z-WhOt%gJJV5Pc`%V%n3__*0<jzwj@Eiq95s2H7pFJV|gLRA|4TEy(kVlVya8phEpZ
zra)C6Ra7Ux5UPNRB?=pYb<PKq_M7uW>_7o9QP^<v9nl;h6BL*U;>V!Mv!z@o=ST>E
zRVYuMCov7qQkq;L`3bHn5-u(^NxB8W*?d5ni4m&mu#6&5qL5E|^FJ9Yn4qPcH&9Se
z$$WBwJjdi&iWLyv<^uT{FeRLd{$N4p$vn~;lV8aNF!F8|RN4!ZKCf&Hlx9>}4Yg*i
ziYrjTM-_c0QKSUKkiwA4kORaelNB{YxziXj!MtJyP?Snfw$kRBJW0J{@-11e$!Z!~
zCI_g>O|H`76D(oK0P4wQuxC&LCq>@LiJHogK$@d@0&b)7<PNPFKvw{b+H9qr$H)S*
F835EFvi1M~

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 053c0418497..6e710f053cf 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"
-- 
GitLab