Second Life viewer sources 1.20.3

2 files changed, 21 insertions, 4 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index d0ee7f0..b36a4ea 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -1032,6 +1032,9 @@ If you continue to have problems, please visit: http://www.secondlife.com/suppor
 MINSPECS
 Do you wish to visit [_URL] for more information?
                 </message>
+                <ignore message="ignore">
+                        Ignore unsupported hardware
+                </ignore>
                 <option name="Yes">
                         Yes
                 </option>
@@ -1067,6 +1070,20 @@ Do you wish to visit [_URL] for more information?
                         510
                 </message>
         </alert>
+
+        <alert modal="true" name="UnknownGPU">
+                <message name="message">
+Your system contains a graphics card that is unknown to us at this time.  
+This is often the case with new hardware we haven't had a chance to 
+test.  Second Life will most likely run properly, but you may need to 
+adjust your graphics settings to something more appropriate.
+(Edit->Preferences->Graphics).
+                </message>
+                <ignore name="ignore">
+                        Ignore unknown graphics card
+                </ignore>
+        </alert>
+
         <alert modal="true" name="DisplaySettingsRecommended">
                 <message name="message">
                         Display settings have been set to recommended levels
diff --git a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
index b8341f2..4e26986 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_world_map.xml
@@ -149,20 +149,20 @@
              image_name="map_track_16.tga" left="1013" mouse_opaque="true"
              name="avatar_icon" width="16" />
         <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
-             label="My Friends" left_delta="20" max_chars="60" mouse_opaque="true"
+             label="Online Friends" left_delta="20" max_chars="60" mouse_opaque="true"
              name="friend combo" tool_tip="Friend to Show on Map" width="202">
                 <combo_item name="none_selected" value="None">
-                        My Friends
+                        Online Friends
                 </combo_item>
         </combo_box>
         <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
              image_name="map_track_16.tga" left="1013" mouse_opaque="true"
              name="landmark_icon" width="16" />
         <combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
-             label="My Landmarks" left_delta="20" max_chars="60" mouse_opaque="true"
+             label="Landmarks" left_delta="20" max_chars="60" mouse_opaque="true"
              name="landmark combo" tool_tip="Landmark to Show on Map" width="202">
                 <combo_item name="none_selected" value="None">
-                        My Landmarks
+                        Landmarks
                 </combo_item>
         </combo_box>
         <icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"