diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
5 files changed, 31 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml index d714cc613e..ae1fb4cccd 100644 --- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml @@ -57,7 +57,8 @@ top="27" visible="false" width="315" - word_wrap="true"> + word_wrap="true" + parse_urls="false"> Connecting to [CALLEE_NAME] </text> <text @@ -68,7 +69,8 @@ Connecting to [CALLEE_NAME] name="calling" top="27" width="315" - word_wrap="true"> + word_wrap="true" + parse_urls="false"> Calling [CALLEE_NAME] </text> <text @@ -90,7 +92,8 @@ No Answer. Please try again later. name="nearby" top="27" width="315" - word_wrap="true"> + word_wrap="true" + parse_urls="false"> You have been disconnected from [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] </text> <text @@ -101,7 +104,8 @@ No Answer. Please try again later. name="nearby_P2P_by_other" top="27" width="315" - word_wrap="true"> + word_wrap="true" + parse_urls="false"> Your call has ended. [RECONNECT_NEARBY] </text> <text @@ -112,7 +116,8 @@ No Answer. Please try again later. name="nearby_P2P_by_agent" top="27" width="315" - word_wrap="true"> + word_wrap="true" + parse_urls="false"> You have ended the call. [RECONNECT_NEARBY] </text> <text @@ -123,7 +128,8 @@ No Answer. Please try again later. name="leaving" top="62" width="315" - word_wrap="true"> + word_wrap="true" + parse_urls="false"> Leaving [CURRENT_CHAT]. </text> <button diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml index a9f6b8045d..0f7c6a2aa5 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view.xml @@ -33,6 +33,16 @@ function="People.Nearby.ViewSort.CheckItem" parameter="sort_distance"/> </menu_item_check> + <menu_item_check + label="Sort by Recent arrival" + name="sort_arrival"> + <menu_item_check.on_click + function="People.Nearby.ViewSort.Action" + parameter="sort_arrival"/> + <menu_item_check.on_check + function="People.Nearby.ViewSort.CheckItem" + parameter="sort_arrival"/> + </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_check name="view_icons" label="View People Icons"> <menu_item_check.on_click diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 6b164c660a..9eaa5330c3 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -8277,6 +8277,13 @@ Failed to save snapshot to [PATH]: Directory does not exist. type="notifytip"> Error saving preset [NAME]. </notification> + + <notification + icon="notifytip.tga" + name="DefaultPresetNotSaved" + type="notifytip"> +Can not overwrite default preset. + </notification> <notification icon="notifytip.tga" diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml index 4121acdfb0..60e5a03d51 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notify.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml @@ -43,6 +43,7 @@ layout="topleft" left_pad="10" name="title" + parse_urls="false" text_color="GroupNotifyTextColor" top="5" use_ellipses="true" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a50d5005fc..1540e9bc95 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -53,7 +53,7 @@ UI Scaling: [UI_SCALE] Draw distance: [DRAW_DISTANCE]m Bandwidth: [NET_BANDWITH]kbit/s LOD factor: [LOD_FACTOR] -Render quality: [RENDER_QUALITY] / 7 +Render quality: [RENDER_QUALITY] Advanced Lighting Model: [GPU_SHADERS] Texture memory: [TEXTURE_MEMORY]MB VFS (cache) creation time: [VFS_TIME] |