1 files changed, 45 insertions, 16 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index aa0f67e..265fca8 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -960,6 +960,15 @@ based on your system configuration.
                         OK
                 </option>
         </alert>
+        <alert modal="true" name="DisplaySettingsNoShaders">
+                <message name="message">
+                        [SECOND_LIFE] crashed while initializing graphics drivers.
+Shaders will be disabled in order to avoid some common driver errors.
+This will disable some graphics features.
+We recommend updating your graphics card drivers.
+Shaders can be re-enabled in Preferences &gt; Graphics Detail.
+                </message>
+        </alert>
         <alert modal="true" name="CannotRequestDomain">
                 <message name="message">
                         Unable to connect to server.
@@ -2002,14 +2011,6 @@ Click Quit to exit [SECOND_LIFE] immediately.
                         Quit
                 </option>
         </alert>
-        <alert modal="true" name="SelectSingleRate">
-                <message name="message">
-                        Select a single object to rate
-                </message>
-                <option name="OK">
-                        OK
-                </option>
-        </alert>
         <alert modal="true" name="OnlyOfficerCanBuyLand">
                 <message name="message">
                         Unable to buy land for the group:
@@ -3061,14 +3062,6 @@ from the &apos;Edit&apos; menu.
                         Decline
                 </option>
         </alert>
-        <alert name="HandleRateOwner">
-                <message name="message">
-                        Can&apos;t rate this object&apos;s owner, object is owned by a group.
-                </message>
-                <option name="OK">
-                        OK
-                </option>
-        </alert>
         <alert name="KickUser">
                 <message name="message">
                         Kick this user with what message?
@@ -4259,4 +4252,40 @@ the contents of your Lost And Found folder?
                         When copying a SLURL to your clipboard
                 </ignore>
         </alert>
+        <alert modal="true" name="IMSessionStartError">
+            <message name="message">
+                    Error starting a new IM session with [RECIPIENT].
+                        [REASON]
+                </message>
+                <option default="true" name="OK">
+                    OK
+                </option>
+        </alert>
+        <alert modal="true" name="IMSessionStartNotVerified">
+            <message name="message">
+                    Error starting a new IM session with [RECIPIENT].
+                        [REASON]
+                </message>
+                <option default="true" name="OK">
+                    OK
+                </option>
+        </alert>
+        <alert modal="true" name="IMSessionEventError">
+            <message name="message">
+                    Error [EVENT] [RECIPIENT].
+                        [REASON]
+                </message>
+                <option default="true" name="OK">
+                    OK
+                </option>
+        </alert>
+        <alert modal="true" name="ForceCloseIMSession">
+            <message name="messsage">
+                    Your IM session with [NAME] must close.
+            [REASON]
+                </message>
+                <option default="true" name="OK">
+                    OK
+                </option>
+        </alert>
 </alerts>