From 7a69d736b5e9e725cda9e9892b37d112883fd835 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 23 Feb 2011 16:41:03 -0800 Subject: SOCIAL-547 WIP Add skin selection dropdown to login screen add skin chooser to login screen --- indra/newview/skins/default/xui/en/panel_login.xml | 40 ++++++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 806182bcb4..9782c23751 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -47,8 +47,8 @@ auto_resize="false" follows="left|bottom" name="login" layout="topleft" -width="695" -min_width="695" +width="705" +min_width="705" user_resize="false" height="80"> + + Mode: + + + + + Start at: @@ -136,7 +162,7 @@ control_name="NextLoginLocation" max_chars="128" top_pad="0" name="start_location_combo" - width="170"> + width="165"> Date: Wed, 23 Feb 2011 16:41:17 -0800 Subject: SOCIAL-547 WIP Add skin selection dropdown to login screen add confirmation dialog to mode change --- indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f008042a81..412349a0d1 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6714,6 +6714,17 @@ The site at '<nolink>[HOST_NAME]</nolink>' in realm ' + + Changing modes requires you to quit and restart. + + - Your CPU speed does not meet the minimum requirements. -- cgit v1.2.3 From e0b75fd528390277e265aae810a9bf5a1b595405 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 24 Feb 2011 18:41:06 -0800 Subject: SOCIAL-555 WIP back quit confirmation notification flagged various notification as "failure" notifications that should be shown in minimal skin --- indra/newview/skins/default/xui/en/notifications.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 412349a0d1..58b50dfec1 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -163,8 +163,9 @@ No tutorial is currently available. icon="alertmodal.tga" name="LoginFailedNoNetwork" type="alertmodal"> -Could not connect to the [SECOND_LIFE_GRID]. -'[DIAGNOSTIC]' + fail + Could not connect to the [SECOND_LIFE_GRID]. + '[DIAGNOSTIC]' Make sure your Internet connection is working properly. Message Template [PATH] not found. + fail @@ -689,6 +691,7 @@ There was a problem uploading a report screenshot due to the following reason: [ icon="alertmodal.tga" name="MustAgreeToLogIn" type="alertmodal"> + fail You must agree to the Terms of Service to continue logging into [SECOND_LIFE]. @@ -726,6 +729,7 @@ You can not wear that item because it has not yet loaded. Please try again in a icon="alertmodal.tga" name="MustHaveAccountToLogIn" type="alertmodal"> + fail Oops! Something was left blank. You need to enter the Username name of your avatar. @@ -747,6 +751,7 @@ You need an account to enter [SECOND_LIFE]. Would you like to create one now? icon="alertmodal.tga" name="InvalidCredentialFormat" type="alertmodal"> + fail You need to enter either the Username or both the First and Last name of your avatar into the Username field, then login again. -- cgit v1.2.3 From c373474cd4de4c34ed1d2b766bdde6d9a0c85351 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 24 Feb 2011 19:21:30 -0800 Subject: enabled generic error messages from server for minimal skin --- indra/newview/skins/default/xui/en/notifications.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 58b50dfec1..80b6867807 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2434,6 +2434,7 @@ Display settings have been set to recommended levels based on your system config name="ErrorMessage" type="alertmodal"> [ERROR_MESSAGE] + fail -- cgit v1.2.3 From 7eee709d777e9668126bdb1dd2e0b234f29b2b4e Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Fri, 25 Feb 2011 16:29:33 -0800 Subject: SOCIAL-560 FIX enable notification of paid/received lindens --- .../newview/skins/default/xui/en/notifications.xml | 217 ++++++++++++++++++++- 1 file changed, 216 insertions(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 80b6867807..feba6fd035 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -408,6 +408,7 @@ Add this Ability to '[ROLE_NAME]'? type="alertmodal"> Joining this group costs L$[COST]. Do you wish to proceed? + funds Joining this group costs L$[COST]. You do not have enough L$ to join this group. + funds funds fail For L$[COST] you can enter this land ('[PARCEL_NAME]') for [TIME] hours. Buy a pass? + funds Error processing snapshot data + fail Error encoding snapshot. + fail There was a problem sending a snapshot due to the following reason: [REASON] + fail There was a problem uploading a report screenshot due to the following reason: [REASON] + fail Could not put on outfit. The outfit folder contains no clothing, body parts, or attachments. + fail You can not wear clothes or body parts that are in the trash + fail Could not attach object. Exceeds the attachments limit of [MAX_ATTACHMENTS] objects. Please detach another object first. + fail You can not wear that item because it has not yet loaded. Please try again in a minute. + fail fail Gesture save failed. Please try again in a minute. +fail Could not save gesture because the object or the associated object inventory could not be found. The object may be out of range or may have been deleted. +fail There was a problem saving a gesture due to the following reason: [REASON]. Please try resaving the gesture later. +fail Could not save notecard because the object or the associated object inventory could not be found. The object may be out of range or may have been deleted. +fail There was a problem saving a notecard due to the following reason: [REASON]. Please try re-saving the notecard later. +fail There was a problem saving a script due to the following reason: [REASON]. Please try re-saving the script later. +fail Could not save the script because the object it is in could not be found. The object may be out of range or may have been deleted. +fail There was a problem saving a compiled script due to the following reason: [REASON]. Please try re-saving the script later. +fail Oops, Your Start Region is not defined. Please type the Region name in Start Location box or choose My Last Location or My Home as your Start Location. +fail @@ -1055,6 +1077,7 @@ Please type the Region name in Start Location box or choose My Last Location or type="alertmodal"> Could not start or stop the script because the object it is on could not be found. The object may be out of range or may have been deleted. + fail Unable to download file + fail Unable to write file [[FILE]] + fail + fail + fail fail The region [REGION] does not allow terraforming. + fail + fail Unable to give inventory item. + fail Cannot give more than 42 items in a single inventory transfer. + fail You do not have permission to transfer the selected items. + fail You do not have permission to copy [COUNT] of the selected items. You will lose these items from your inventory. Do you really want to give these items? + fail You do not have permission to transfer the selected folder. + fail ACQUIRE ERROR: Too many objects selected. + fail ACQUIRE ERROR: Objects span more than one region. Please move all objects to be acquired onto the same region. + fail Unable to link these [COUNT] objects. You can link a maximum of [MAX] objects. + fail You can only link complete sets of objects, and must select more than one object. + fail fail fail fail + fail Couldn't open uploaded sound file for reading: [FILE] + fail File does not appear to be a RIFF WAVE file: [FILE] + fail File does not appear to be a PCM WAVE audio file: [FILE] + fail File has invalid number of channels (must be mono or stereo): [FILE] + fail File does not appear to be a supported sample rate (must be 44.1k): [FILE] + fail File does not appear to be a supported word size (must be 8 or 16 bit): [FILE] + fail Could not find 'data' chunk in WAV header: [FILE] + fail Wrong chunk size in WAV file: [FILE] + fail Audio file is too long (10 second maximum): [FILE] + fail fail Couldn't open temporary compressed sound file for writing: [FILE] + fail Unknown Vorbis encode failure on: [FILE] + fail Unable to encode file: [FILE] + fail We can't fill in your username and password. This may happen when you change network setup + fail @@ -1450,6 +1507,7 @@ Unable to encode file: [FILE] name="CorruptResourceFile" type="alertmodal"> Corrupt resource file: [FILE] + fail Unknown Linden resource file version in file: [FILE] + fail Unable to create output file: [FILE] + fail [APP_NAME] does not currently support bulk upload of animation files. + fail Unable to upload [FILE] due to the following reason: [REASON] Please try again later. + fail + fail You cannot create a landmark here because the owner of the land doesn't allow it. + fail Not able to perform 'recompilation'. Select an object with a script. + fail fail fail fail Unable to open script in object without modify permissions. + fail fail fail No frontmost floater to save. + fail Your search terms were too short so no search was performed. + fail @@ -3495,6 +3633,7 @@ Sorry, you have to wait longer before you can change your display name. See http://wiki.secondlife.com/wiki/Setting_your_display_name Please try again later. + fail fail The display name you wish to set contains invalid characters. + fail Your display name must contain letters other than punctuation. + fail @@ -3533,6 +3675,7 @@ Please try again later. name="OfferTeleport" type="alertmodal"> Offer a teleport to your location with the following message? + confirm
Join me in [REGION] @@ -3554,6 +3697,7 @@ Join me in [REGION] name="OfferTeleportFromGod" type="alertmodal"> God summon Resident to your location? + confirm Join me in [REGION] @@ -3575,6 +3719,7 @@ Join me in [REGION] name="TeleportFromLandmark" type="alertmodal"> Are you sure you want to teleport to <nolink>[LOCATION]</nolink>? + confirm -Teleport to [PICK]? + Teleport to [PICK]? + confirm Teleport to [CLASSIFIED]? + confirm Teleport to [HISTORY_ENTRY]? + confirm Type a short announcement which will be sent to everyone currently in your estate. + confirm