diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 987dbee5c..f9af3a2a9 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -122,6 +122,7 @@ static void onClickFly(void*); static void onClickPush(void*); static void onClickVoice(void*); static void onClickBuild(void*); +static void onClickSeeAV(void*); static void onClickScripts(void*); static void onClickBuyLand(void*); static void onClickScriptDebug(void*); @@ -168,6 +169,7 @@ mSquareMetersCommitted(0) childSetAction("buyland", onClickBuyLand, this ); childSetAction("buycurrency", onClickBuyCurrency, this ); childSetAction("no_build", onClickBuild, this ); + childSetAction("status_SeeAV", onClickSeeAV, this ); childSetAction("no_scripts", onClickScripts, this ); childSetAction("restrictpush", onClickPush, this ); childSetAction("status_no_voice", onClickVoice, this ); @@ -831,6 +833,11 @@ static void onClickBuild(void*) LLNotificationsUtil::add("NoBuild"); } +static void onClickSeeAV(void*) +{ + LLNotificationsUtil::add("SeeAvatars"); +} + static void onClickScripts(void*) { LLViewerRegion* region = gAgent.getRegion(); diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml index 7e3f668e4..83da40766 100644 --- a/indra/newview/skins/default/xui/en-us/notifications.xml +++ b/indra/newview/skins/default/xui/en-us/notifications.xml @@ -1,5 +1,4 @@ - Don't show me this again @@ -180,7 +179,7 @@ The media filters have been cleared name="MissingAlert" label="Unknown Alert Message" type="alertmodal"> -Your version of [APP_NAME] does not know how to display the alert message it just received. +Your version of [APP_NAME] does not know how to display the alert message it just received. Please verify that you have the latest [APP_NAME] installed. Error details: The alert called '[_NAME]' was not found in notifications.xml. -Could not connect to the [SECOND_LIFE_GRID]. +Could not connect to the [SECOND_LIFE_GRID]. '[DIAGNOSTIC]' Make sure your Internet connection is working properly. -Granting modify rights to another resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission. +Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission. Do you want to grant modify rights for [NAME]? -Granting modify rights to another resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission. +Granting modify rights to another Resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission. Do you want to grant modify rights for the selected Residents? - + - -This upload will cost L$[PRICE], do you wish to continue with the upload? + +This upload will cost [CURRENCY][PRICE], do you wish to continue with the upload? + type="notifytip"> Sorry, but system was unable to complete the teleport connection. Try again in a moment. + type="notifytip"> Sorry, but the system was unable to complete your teleport request in a timely fashion. Please try again in a few minutes. -This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some residents unhappy if bidding has begun. Force ownership? +This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some Residents unhappy if bidding has begun. +Force ownership? + confirm + type="notifytip"> Your clothing is still downloading. You can use [SECOND_LIFE] normally and other people will see you correctly.
@@ -2860,7 +2861,7 @@ Can't add estate owner to estate 'Banned Resident' list. + type="notifytip"> Can't change appearance until clothing and shape are loaded. @@ -3061,6 +3062,7 @@ Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and othe name="WebLaunchSinguIssue" type="alertmodal"> Visit the Singularity Issue Tracker, to report bugs and issues with Singularity Viewer. +Please be sure that your report won't be a duplicate of an existing one. -Go to the Scripting Guide for scripting help? +Do you want to open the Scripting Guide for help with scripting? -Go to the LSL Portal for scripting help? +Do you want to visit the LSL Portal for help with scripting? - "There are too many prims selected. Please select [MAX_PRIM_COUNT] or fewer prims and try again" +There are too many prims selected. Please select [MAX_PRIM_COUNT] or fewer prims and try again @@ -4231,7 +4233,7 @@ Default: off label="Voice Version Mismatch" name="VoiceVersionMismatch" type="alertmodal"> -This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. Please upgrate to the latest version. +This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update [APP_NAME]. -Gesture [NAME] is missing from database. +Gesture [NAME] is missing from the database. -The objects on the selected parcel of land owned by the resident '[NAME]' have been returned to their owner. +The objects on the selected parcel of land owned by the Resident '[NAME]' have been returned to their owner. This land has flying disabled ('no fly'). -You cannot fly here. +You cannot fly here, without Always allow fly enabled from System preferences. @@ -5942,6 +5944,14 @@ You cannot create objects here. + + +This parcel hides avatars and text chat from another parcel. You can't see other residents outside the parcel, and those outside are not able to see you. Regular text chat on channel 0 is also blocked. + + This land has outside scripts disabled ('no outside scripts'). -No scripts will run except those belonging to the land owner. +No scripts will work here except those belonging to the land owner. -Can only claim public land in region you're in. +You can only claim public land in the Region you're in. [NAME] + [MESSAGE] @@ -6253,7 +6264,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ icon="notify.tga" name="TeleportOffered" type="notify"> -[NAME] has offered to teleport you to his or her location: +[NAME] has offered to teleport you to their location: [MESSAGE] @@ -7299,4 +7310,3 @@ Your shape, skin, hair or eyes might be defect. - diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml index 863827baa..3a74a841d 100644 --- a/indra/newview/skins/default/xui/en-us/strings.xml +++ b/indra/newview/skins/default/xui/en-us/strings.xml @@ -263,7 +263,8 @@ Load Files Choose Directory - + Sound: + Sleeps script for [SLEEP_TIME] seconds.