From 954c8fb1e3c47b3ebf219f97129e5c6e9bf911b8 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Tue, 10 Sep 2013 15:33:26 -0500 Subject: MAINT-3131 Add a GPU memory bandwidth benchmark. --- indra/newview/skins/default/xui/en/menu_viewer.xml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 95a7839337..8f9522c180 100755 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2397,6 +2397,12 @@ + + + Date: Mon, 11 Nov 2013 18:41:25 -0800 Subject: MAINT-3432 FIX Help -> Report Bug should open jira with pre-populated fields moved viewer information strings into LLAppViewer replaced Help>Report a Bug with direct use of Jira link --- .../newview/skins/default/xui/en/floater_about.xml | 58 +--------------------- indra/newview/skins/default/xui/en/menu_viewer.xml | 3 +- indra/newview/skins/default/xui/en/strings.xml | 36 ++++++++++++++ 3 files changed, 38 insertions(+), 59 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index 703015af20..9668cfa526 100755 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -9,63 +9,7 @@ save_rect="true" title="ABOUT [CAPITALIZED_APP_NAME]" width="470"> - -[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) -[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] - - - -Built with [COMPILER] version [COMPILER_VERSION] - - - -You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP]) -SLURL: <nolink>[SLURL]</nolink> -(global coordinates [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) -[SERVER_VERSION] -[SERVER_RELEASE_NOTES_URL] - - - - -CPU: [CPU] -Memory: [MEMORY_MB] MB -OS Version: [OS_VERSION] -Graphics Card Vendor: [GRAPHICS_CARD_VENDOR] -Graphics Card: [GRAPHICS_CARD] - - -Windows Graphics Driver Version: [GRAPHICS_DRIVER_VERSION] - - -OpenGL Version: [OPENGL_VERSION] - -libcurl Version: [LIBCURL_VERSION] -J2C Decoder Version: [J2C_VERSION] -Audio Driver Version: [AUDIO_DRIVER_VERSION] -Qt Webkit Version: [QT_WEBKIT_VERSION] -Voice Server Version: [VOICE_VERSION] - - - (none) - - -Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) - - -Error fetching server release notes URL. - + + function="Advanced.ReportBug"/> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 7e79d297ef..9ac313cb68 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -20,6 +20,42 @@ Initializing VFS... Graphics initialization failed. Please update your graphics driver! + + +[APP_NAME] [VIEWER_VERSION_0].[VIEWER_VERSION_1].[VIEWER_VERSION_2] ([VIEWER_VERSION_3]) [BUILD_DATE] [BUILD_TIME] ([CHANNEL]) +[[VIEWER_RELEASE_NOTES_URL] [ReleaseNotes]] + + Built with [COMPILER] version [COMPILER_VERSION] + +You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP]) +SLURL: <nolink>[SLURL]</nolink> +(global coordinates [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) +[SERVER_VERSION] +[SERVER_RELEASE_NOTES_URL] + + + +CPU: [CPU] +Memory: [MEMORY_MB] MB +OS Version: [OS_VERSION] +Graphics Card Vendor: [GRAPHICS_CARD_VENDOR] +Graphics Card: [GRAPHICS_CARD] + + Windows Graphics Driver Version: [GRAPHICS_DRIVER_VERSION] + +OpenGL Version: [OPENGL_VERSION] + +libcurl Version: [LIBCURL_VERSION] +J2C Decoder Version: [J2C_VERSION] +Audio Driver Version: [AUDIO_DRIVER_VERSION] +Qt Webkit Version: [QT_WEBKIT_VERSION] +Voice Server Version: [VOICE_VERSION] + + Packets Lost: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) + Error fetching server release notes URL. + Restoring... Changing resolution... -- cgit v1.2.3 From 44eaa10b80bfe46b0fdab147f3addb45f4720cfc Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 12 Nov 2013 14:51:43 +0200 Subject: MAINT-3068 FIXED "Request Teleport" menu item is added to context menu. --- indra/newview/skins/default/xui/en/menu_avatar_icon.xml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml index 77b9095f7c..410caa7290 100755 --- a/indra/newview/skins/default/xui/en/menu_avatar_icon.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_icon.xml @@ -30,6 +30,12 @@ name="Offer Teleport"> + + + Date: Tue, 12 Nov 2013 15:41:59 -0800 Subject: MAINT-3397 : add localization handler for EstateManagerFailedllTeleportHome message --- indra/newview/skins/default/xui/en/notifications.xml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 964deb35a7..5fb83b91ce 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -9291,10 +9291,19 @@ Link failed -- insufficient land resources Object uses too many physics resources -- its dynamics have been disabled. + + fail +The object '[OBJECT_NAME]' at [OBJECT_POS] cannot teleport estate managers home. + + fail You have been teleported home by the object '[OBJECT_NAME]' on the parcel '[PARCEL_NAME]' @@ -9303,7 +9312,7 @@ You have been teleported home by the object '[OBJECT_NAME]' on the parcel '[PARC fail You have been teleported home by the object '[OBJECT_NAME]' -- cgit v1.2.3 From cbb2daf879497dc25b8e34bc4d9522b195baa62a Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 12 Nov 2013 15:54:09 -0800 Subject: MAINT-3394 : add localization handler for ProblemAddingEstateBanManager message --- indra/newview/skins/default/xui/en/notifications.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 5fb83b91ce..6c1f4321e4 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -4756,6 +4756,14 @@ Problems adding a new estate manager. One or more estates may have a full manag fail + +Unable to add estate owner or manager to ban list. + fail + + Date: Tue, 19 Nov 2013 17:37:21 +0200 Subject: MAINT-3469 FIXED '\n' is shown in 'Can't divide land' notification instead of new string --- indra/newview/skins/default/xui/en/notifications.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 6c1f4321e4..4866151d18 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -9835,7 +9835,9 @@ Not enough leased parcels in selection to join. name="CantDivideLandMultipleParcelsSelected" type="notify"> fail -Can't divide land.\nThere is more than one parcel selected.\nTry selecting a smaller piece of land. +Can't divide land. +There is more than one parcel selected. +Try selecting a smaller piece of land. fail -Can't divide land.\nCan't find the parcel.\nPlease report with Help -> Reprt Bug... +Can't divide land. +Can't find the parcel. +Please report with Help -> Report Bug... Reprt Bug name="CantDivideLandWholeParcelSelected" type="notify"> fail -Can't divide land. Whole parcel is selected.\nTry selecting a smaller piece of land. +Can't divide land. Whole parcel is selected. +Try selecting a smaller piece of land. Date: Thu, 21 Nov 2013 15:51:37 +0200 Subject: MAINT-3480 FIXED Duplicated strings are deleted --- indra/newview/skins/default/xui/en/notifications.xml | 10 +--------- indra/newview/skins/default/xui/en/strings.xml | 3 +-- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 4866151d18..b3fd1fa818 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -9764,15 +9764,7 @@ Only the first 10 selected objects have been disabled. Refresh and make addition type="notify"> fail You need to update your viewer to buy this parcel. - - - - fail -You can't buy this land due to your maturity Rating. You may need to validate your age and/or install the latest Viewer. Please go to the Knowledge Base for details on accessing areas with this maturity Rating. - + Merchant Outbox - Friends - Received Items + Friends All No attachments worn -- cgit v1.2.3