Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/

--HG-- branch : product-engine

Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
f836b852 · Alexei Arabadji · a301ad63 · 58f75f4f · f836b852
Commit f836b852 authored 15 years ago by Alexei Arabadji
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -2297,6 +2297,9 @@ Display settings have been set to recommended levels based on your system config
   name="ErrorMessage"
   type="alertmodal">
 [ERROR_MESSAGE]
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
  </notification>
  <notification