Second Life viewer sources 1.15.1.3

17 files changed, 514 insertions, 414 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 265fca8..a783d00 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -11,7 +11,7 @@
         <alert modal="true" name="FloaterNotFound">
                 <message name="message">
                         Floater error: Could not find the following controls:
- 
+
 [CONTROLS]
                 </message>
                 <option name="OK">
@@ -126,7 +126,7 @@ Enter a brief description of the group&apos;s purpose.
         <alert modal="true" name="CharacterSnapshotSaved">
                 <message name="message">
                         A snapshot of your character has been saved.
- 
+
 Visit the Webpage Studio exhibit to see it.
                 </message>
         </alert>
@@ -146,8 +146,8 @@ Visit the Webpage Studio exhibit to see it.
         </alert>
         <alert modal="true" name="GrantModifyRights">
                 <message name="message">
-                        Granting modify rights to another resident allows them to change 
-ANY objects you may have in-world. Be VERY careful when handing 
+                        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 [FIRST_NAME] [LAST_NAME]?
                 </message>
@@ -212,10 +212,10 @@ Do you want to grant modify rights for [FIRST_NAME] [LAST_NAME]?
         <alert modal="true" name="CreateGroupCanAfford">
                 <message name="message">
                         Creating a group costs L$[COST].
- 
+
 To maintain the group for more than three days,
 you must reach a total of three or more members.
- 
+
 Create group?
                 </message>
                 <option name="Create">
@@ -275,16 +275,16 @@ Are you sure you want to continue?
         </alert>
         <alert modal="true" name="AssignDangerousActionWarning">
                 <message name="message">
-                        You are about to add the Ability &apos;[ACTION_NAME]&apos; to the 
+                        You are about to add the Ability &apos;[ACTION_NAME]&apos; to the
 Role &apos;[ROLE_NAME]&apos;.
- 
+
  *WARNING*
  Any Member in a Role with this Ability can assign themselves--
  and any other member--to Roles that have more powers than they
  currently have, potentially elevating themselves to
  near-Owner power. Be sure you know what you&apos;re doing before
  assigning this Ability.
- 
+
 Add this Ability to &apos;[ROLE_NAME]&apos;?
                 </message>
                 <option name="Yes">
@@ -296,14 +296,14 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
         </alert>
         <alert modal="true" name="AssignDangerousAbilityWarning">
                 <message name="message">
-                        You are about to add the Ability &apos;[ACTION_NAME]&apos; to the 
+                        You are about to add the Ability &apos;[ACTION_NAME]&apos; to the
 Role &apos;[ROLE_NAME]&apos;.
- 
+
  *WARNING*
  Any Member in a Role with this Ability can assign themselves--
  and any other member--all Abilities, elevating themselves
  to near-Owner power.
- 
+
 Add this Ability to &apos;[ROLE_NAME]&apos;?
                 </message>
                 <option name="Yes">
@@ -364,7 +364,7 @@ Go to the Second Life web site for more information on partnering?
                         If this resident has a web profile URL set then you can:
  * Click Load to load the page with the embedded web browser.
  * Click Open to view externally in your default web browser.
- 
+
 When viewing your profile you can enter any URL as your Web Profile.
 Residents can visit the URL you specify when they view your profile.
                 </message>
@@ -373,7 +373,7 @@ Residents can visit the URL you specify when they view your profile.
                 <message name="message">
                         If this resident has a web profile URL set then you can:
  * Click Open to view externally in your default web browser.
- 
+
 When viewing your profile you can enter any URL as your Web Profile.
 Residents can visit the URL you specify when they view your profile.
                 </message>
@@ -478,7 +478,7 @@ Please select an individual to sell to if selling for L$0.
                 <message name="message">
                         The selected [LAND_SIZE] sq. m. land is being set for sale.
 Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
- 
+
 Would you like to continue making this change?
                 </message>
                 <option name="Continue">
@@ -493,10 +493,10 @@ Would you like to continue making this change?
                         Are you sure you want to return all objects shared with
 the group &apos;[NAME]&apos; on this parcel of land
 back to their previous owner&apos;s inventory?
- 
+
 *WARNING* This will delete the non-transferable objects
 deeded to the group!
- 
+
 Objects: [N]
                 </message>
                 <option name="Return">
@@ -511,7 +511,7 @@ Objects: [N]
                         Are you sure you want to return all objects owned by the
 resident &apos;[NAME]&apos; on this parcel of land
 back to their inventory?
- 
+
 Objects: [N]
                 </message>
                 <option name="Return">
@@ -526,7 +526,7 @@ Objects: [N]
                         Are you sure you want to return all objects
 owned by you on this parcel of land back to
 your inventory?
- 
+
 Objects: [N]
                 </message>
                 <option name="Return">
@@ -542,10 +542,10 @@ Objects: [N]
 by you on this parcel of land back to their owner&apos;s inventory?
 Transferable objects deeded to a group will be
 returned to their previous owners.
- 
+
 *WARNING* This will delete the non-transferable objects
 deeded to the group!
- 
+
 Objects: [N]
                 </message>
                 <option name="Return">
@@ -561,10 +561,10 @@ Objects: [N]
 by [NAME] on this parcel of land back to their owner&apos;s inventory?
 Transferable objects deeded to a group will be
 returned to their previous owners.
- 
+
 *WARNING* This will delete the non-transferable objects
 deeded to the group!
- 
+
 Objects: [N]
                 </message>
                 <option name="Return">
@@ -602,7 +602,7 @@ in this region back to their owner&apos;s inventory?
                         Return the objects on this parcel of land
 that are NOT shared with the group [NAME]
 back to their owners?
- 
+
 Objects: [N]
                 </message>
                 <option name="Return">
@@ -690,7 +690,7 @@ The outfit folder contains no clothing, body parts, or attachments.
         <alert modal="true" name="MustHaveAccountToLogIn">
                 <message name="message">
                         You must have an account to connect to [SECOND_LIFE].
- 
+
 Go to www.secondlife.com to create a new account?
                 </message>
                 <option name="OK">
@@ -704,10 +704,10 @@ Go to www.secondlife.com to create a new account?
                 <message name="message">
                         Classified ads appear in the &apos;Classified&apos; section of the
 Search directory for one week.
- 
+
 Fill out your ad, then click &apos;Publish...&apos; to add it to the
 directory.
- 
+
 You&apos;ll be asked for a price to pay when clicking Publish.
 Paying more makes your ad appear higher in the list, and
 also appear higher when people search for keywords.
@@ -750,7 +750,7 @@ There is no reimbursement for fees paid.
                         Some of the display changes that you have made
 require [SECOND_LIFE] to shut down immediately,
 which will cause you to lose any work in progress.
- 
+
 Apply those changes and quit
                 </message>
                 <option name="ApplyandQuit">
@@ -960,15 +960,6 @@ based on your system configuration.
                         OK
                 </option>
         </alert>
-        <alert modal="true" name="DisplaySettingsNoShaders">
-                <message name="message">
-                        [SECOND_LIFE] crashed while initializing graphics drivers.
-Shaders will be disabled in order to avoid some common driver errors.
-This will disable some graphics features.
-We recommend updating your graphics card drivers.
-Shaders can be re-enabled in Preferences &gt; Graphics Detail.
-                </message>
-        </alert>
         <alert modal="true" name="CannotRequestDomain">
                 <message name="message">
                         Unable to connect to server.
@@ -980,7 +971,7 @@ Could not request domain name: [HOST]
                         Unable to find the server domain name.
 This could be the result of a lost network connection
 or a server problem.
- 
+
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
                 </message>
@@ -1012,7 +1003,7 @@ please go to the support section and report this problem.
 Often this means that your computer&apos;s clock is set incorrectly.
 Please go to Control Panels and make sure the time and date
 are set correctly.
- 
+
 If you continue to receive this error, please go
 to the Support section of the SecondLife.com web site
 and report the problem.
@@ -1060,7 +1051,7 @@ SecondLife.com web site.
                 <message name="message">
                         Unknown problem trying to connect.
 (Blank error message from server.)
- 
+
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
                 </message>
@@ -1074,7 +1065,7 @@ for advice and a link to the system status web page.
         <alert modal="true" name="CannotConnectNoReplyFromLogin">
                 <message name="message">
                         Unable to connect.  No reply from login database.
- 
+
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
                 </message>
@@ -1093,10 +1084,10 @@ for advice and a link to the system status web page.
         <alert modal="true" name="FirstRunDialog">
                 <message name="message">
                         [SECOND_LIFE] installation is complete.
- 
+
 If this is your first time using [SECOND_LIFE], you will need to create
 an account before you can log on.
- 
+
 Return to www.secondlife.com to create a new account?
                 </message>
                 <option name="NewAccount...">
@@ -1124,7 +1115,7 @@ Please check your network connection.
                 <message name="message">
                         Unable to connect.  Login packet never received by
 login server.
- 
+
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
                 </message>
@@ -1137,11 +1128,11 @@ for advice and a link to the system status web page.
         </alert>
         <alert modal="true" name="WelcomeToSecondLife">
                 <message name="message">
-                        Welcome to [SECOND_LIFE]! 
- 
+                        Welcome to [SECOND_LIFE]!
+
 Use arrow keys to walk.
- 
-Please choose the male or female character. 
+
+Please choose the male or female character.
 You can change your mind later.
                 </message>
                 <option name="Male">
@@ -1153,10 +1144,10 @@ You can change your mind later.
         </alert>
         <alert modal="true" name="WelcomeToSecondLifeSimple">
                 <message name="message">
-                        Welcome to [SECOND_LIFE]! 
- 
+                        Welcome to [SECOND_LIFE]!
+
 Use arrow keys to walk.
- 
+
 Please choose the male or female character.
                 </message>
                 <option name="Male">
@@ -1287,7 +1278,7 @@ same region.
         <alert modal="true" name="TakeLockedOrNotOwnedBy">
                 <message name="message">
                         At least one object is locked or not owned by you.
-If an object is not owned by you and you take it, 
+If an object is not owned by you and you take it,
 next owner permissions will be applied to it and
 possibly restrict your ability to modify or copy it
 in the future.
@@ -1304,8 +1295,8 @@ Are you sure you want to take these itmes?
         <alert modal="true" name="PromptGoToCurrencyPage">
                 <message name="message">
                         [EXTRA]
- 
- 
+
+
 Go to [URL] for information on purchasing currency?
                 </message>
                 <option name="GotoPage">
@@ -1364,50 +1355,50 @@ Expected [VALIDS]
         </alert>
         <alert modal="true" name="SoundFileNotRIFF">
                 <message name="message">
-                        File does not appear to be a RIFF WAVE file: 
+                        File does not appear to be a RIFF WAVE file:
 [FILE]
                 </message>
         </alert>
         <alert modal="true" name="SoundFileNotPCM">
                 <message name="message">
-                        File does not appear to be a PCM WAVE audio file: 
+                        File does not appear to be a PCM WAVE audio file:
 [FILE]
                 </message>
         </alert>
         <alert modal="true" name="SoundFileInvalidChannelCount">
                 <message name="message">
-                        File has invalid number of channels (must be mono or stereo): 
+                        File has invalid number of channels (must be mono or stereo):
 [FILE]
                 </message>
         </alert>
         <alert modal="true" name="SoundFileInvalidSampleRate">
                 <message name="message">
-                        File does not appear to be a supported sample rate (must be 44.1k): 
+                        File does not appear to be a supported sample rate (must be 44.1k):
 [FILE]
                 </message>
         </alert>
         <alert modal="true" name="SoundFileInvalidWordSize">
                 <message name="message">
-                        File does not appear to be a supported word size (must be 8 or 16 bit): 
+                        File does not appear to be a supported word size (must be 8 or 16 bit):
 [FILE]
                 </message>
         </alert>
         <alert modal="true" name="SoundFileInvalidHeader">
                 <message name="message">
-                        Could not find &apos;data&apos; chunk in WAV header: 
+                        Could not find &apos;data&apos; chunk in WAV header:
 [FILE]
                 </message>
         </alert>
         <alert modal="true" name="SoundFileInvalidTooLong">
                 <message name="message">
-                        Audio file is too long (10 second maximum): 
+                        Audio file is too long (10 second maximum):
 [FILE]
                 </message>
         </alert>
         <alert modal="true" name="ProblemWithFile">
                 <message name="message">
                         Problem with file [FILE]:
- 
+
 [ERROR]
                 </message>
         </alert>
@@ -1679,11 +1670,11 @@ Try selecting a smaller area.
         </alert>
         <alert modal="true" name="ParcelCanPlayMusic">
                 <message name="message">
-                        This location can play streaming music. 
- 
+                        This location can play streaming music.
+
 Music requires a 768 kbps or faster
 Internet connection.
- 
+
 Play music when available?
                 </message>
                 <option name="PlayMusic">
@@ -1695,14 +1686,14 @@ Play music when available?
         </alert>
         <alert modal="true" name="ParcelCanPlayMedia">
                 <message name="message">
-                        This location can play streaming video. 
- 
-Streaming video requires a 768 kbps or 
+                        This location can play streaming video.
+
+Streaming video requires a 768 kbps or
 faster Internet connection.
- 
+
 Play streaming video when available?
- 
-(You can change this option later under 
+
+(You can change this option later under
 Preferences &gt; Audio &amp; Video.)
                 </message>
                 <option name="PlayMedia">
@@ -1815,7 +1806,7 @@ The region [REGION] does not allow transfer of land.
                 <message name="message">
                         Unable to abandon land:
 You must select an entire parcel to release it.
-Try double-clicking to select an entire parcel, or 
+Try double-clicking to select an entire parcel, or
 first divide your parcel.
                 </message>
         </alert>
@@ -1824,7 +1815,7 @@ first divide your parcel.
                         You are about to release [AREA] sq. meters of land.
 Releasing this parcel will remove it from your land
 holdings, but will not credit any L$.
- 
+
 Release this land?
                 </message>
                 <option name="Release">
@@ -1853,7 +1844,7 @@ and dragging.
                         Dividing this land will split this parcel into two
 and each parcel can have its own settings. Some settings
 will be reset to defaults after the operation.
- 
+
 Divide land?
                 </message>
                 <option name="Divide">
@@ -1901,12 +1892,12 @@ and dragging.
         </alert>
         <alert modal="true" name="JoinLandWarning">
                 <message name="message">
-                        Joining this land will create one large parcel 
-out of all parcels intersecting the selected rectangle. 
- 
-You will need to reset the name and options of the 
-new parcel. 
- 
+                        Joining this land will create one large parcel
+out of all parcels intersecting the selected rectangle.
+
+You will need to reset the name and options of the
+new parcel.
+
 Join land?
                 </message>
                 <option name="Join">
@@ -1984,7 +1975,7 @@ and provide details about your network setup.
         <alert modal="true" name="AppEarlyExit">
                 <message name="message">
                         [MESSAGE]
- 
+
 We are unable to recover from this problem. Please
 uninstall and reinstall before trying again. If this
 problem persists, check the Tech Support FAQ at:
@@ -1997,9 +1988,9 @@ www.secondlife.com/support.
         <alert modal="true" name="YouHaveBeenLoggedOut">
                 <message name="message">
                         You have been logged out of [SECOND_LIFE]:
- 
+
 [MESSAGE]
- 
+
 Click Continue to look at existing IM and chat.
 You will not be able to perform any other operations.
 Click Quit to exit [SECOND_LIFE] immediately.
@@ -2020,10 +2011,10 @@ Please activate another group using Edit -&gt; Groups...
         </alert>
         <alert model="true" name="AddFriend" title="Add Friend">
                 <message name="message">
-                        Friends can give permissions to 
-track each other on the map and 
-receive online status updates. 
- 
+                        Friends can give permissions to
+track each other on the map and
+receive online status updates.
+
 Offer friendship to [NAME]?
                 </message>
                 <option name="Offer">
@@ -2058,9 +2049,9 @@ Offer friendship to [NAME]?
         <alert modal="true" name="GodDeleteAllScriptedPublicObjectsByUser">
                 <message name="message">
                         Are you sure you want to delete all scripted objects owned by
- 
+
 ** [AVATAR_NAME] **
- 
+
 on all others land in this sim?
                 </message>
                 <option name="DELETE!!">
@@ -2073,9 +2064,9 @@ on all others land in this sim?
         <alert modal="true" name="GodDeleteAllScriptedObjectsByUser">
                 <message name="message">
                         Are you sure you want to DELETE ALL scripted objects owned by
- 
+
 ** [AVATAR_NAME] **
- 
+
 on ALL LAND in this sim?
                 </message>
                 <option name="!!DELETEALL!!">
@@ -2089,9 +2080,9 @@ on ALL LAND in this sim?
                 <message name="message">
                         Are you sure you want to DELETE ALL objects (scripted or not)
 owned by
- 
+
 ** [AVATAR_NAME] **
- 
+
 on ALL LAND in this sim?
                 </message>
                 <option name="!!DELETEALL!!">
@@ -2104,7 +2095,7 @@ on ALL LAND in this sim?
         <alert modal="true" name="PublishGroupInfoToWeb">
                 <message name="message">
                         Selecting the &quot;Publish on the Web&quot; option allows us to publish
-the group name, insignia, charter, titles, and founder on the 
+the group name, insignia, charter, titles, and founder on the
 [SECOND_LIFE] website. You are responsible for indicating if any
 of the above content is considered Mature according to the
 Community Standards.
@@ -2123,7 +2114,7 @@ Community Standards.
         <alert modal="true" name="MinClassifiedPrice">
                 <message name="message">
                         Price to pay for listing must be at least L$[MIN_PRICE].
- 
+
 Please enter a higher price.
                 </message>
         </alert>
@@ -2284,11 +2275,11 @@ Please select a smaller area and try again.
                 <message name="message">
                         By deeding this parcel, the group will be required
 to have and maintain sufficient land use credits.
- 
+
 The purchase price of the land is not refunded to
 the owner. If a deeded parcel is sold, the sale
 price will be divided evenly among group members.
- 
+
 Deed this [AREA] square meters of land to the group
 &apos;[GROUP_NAME]&apos;?
                 </message>
@@ -2303,14 +2294,14 @@ Deed this [AREA] square meters of land to the group
                 <message name="message">
                         By deeding this parcel, the group will be required
 to have and maintain sufficient land use credits.
- 
+
 The deed will include a simultaneous land
 contribution to the group from &apos;[FIRST_NAME] [LAST_NAME]&apos;.
- 
+
 The purchase price of the land is not refunded to
 the owner. If a deeded parcel is sold, the sale
 price will be divided evenly among group members.
- 
+
 Deed this [AREA] square meters of land to the group
 &apos;[GROUP_NAME]&apos;?
                 </message>
@@ -2344,7 +2335,7 @@ Could not request domain name: [HOST_NAME]
                         Unable to find the server domain name.
 This could be the result of a lost network connection
 or a server problem.
- 
+
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
                 </message>
@@ -2383,7 +2374,7 @@ for advice and a link to the system status web page.
         <alert modal="true" name="AvatarMoved">
                 <message name="message">
                         Your [TYPE] location is not currently available.
-[HELP] 
+[HELP]
 You have been moved into a nearby region.
                 </message>
         </alert>
@@ -2397,10 +2388,10 @@ will see you correctly.
         <alert modal="true" name="FirstRun">
                 <message name="message">
                         [SECOND_LIFE] installation is complete.
- 
+
 If this is your first time using [SECOND_LIFE], you will need to create
 an account before you can log on.
- 
+
 Return to www.secondlife.com to create a new account?
                 </message>
                 <option name="NewAccount...">
@@ -2421,7 +2412,7 @@ Please check your network connection.
                 <message name="message">
                         Unable to connect.  Login packet never received by
 login server.
- 
+
 Please try again in a few minutes, or click Help
 for advice and a link to the system status web page.
                 </message>
@@ -2435,9 +2426,9 @@ for advice and a link to the system status web page.
         <alert modal="true" name="WelcomeNoClothes">
                 <message name="message">
                         Your character will appear in a moment.
- 
+
 Use arrow keys to walk.
- 
+
 Press the F1 key at any time for help or
 to learn more about [SECOND_LIFE].
                 </message>
@@ -2445,12 +2436,12 @@ to learn more about [SECOND_LIFE].
         <alert modal="true" name="WelcomeChooseSex" nodefault="true">
                 <message name="message">
                         Your character will appear in a moment.
- 
+
 Use arrow keys to walk.
- 
+
 Press the F1 key at any time for help or
-to learn more about [SECOND_LIFE]. 
- 
+to learn more about [SECOND_LIFE].
+
 Please choose the male or female character.
 You can change your mind later.
                 </message>
@@ -2479,10 +2470,10 @@ You can change your mind later.
         <alert modal="true" name="FlushMapVisibilityCaches">
                 <message name="message">
                         This will flush the map caches on this region.
- 
-This is really only useful for debugging. 
- 
-(In production, wait 5 minutes, then everyone&apos;s map will 
+
+This is really only useful for debugging.
+
+(In production, wait 5 minutes, then everyone&apos;s map will
 update after they relog.)
                 </message>
                 <option name="OK">
@@ -2543,34 +2534,34 @@ non ALL LAND in this region?
         </alert>
         <alert modal="true" name="InvalidTerrainBitDepth">
                 <message name="message">
-                        Couldn&apos;t set region textures: 
- 
+                        Couldn&apos;t set region textures:
+
 Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].
- 
+
 Replace texture [TEXTURE_NUM] with a 24 bit 512x512 or smaller image
 then click &quot;Set&quot; again.
                 </message>
         </alert>
         <alert modal="true" name="InvalidTerrainSize">
                 <message name="message">
-                        Couldn&apos;t set region textures: 
- 
-Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y]. 
- 
+                        Couldn&apos;t set region textures:
+
+Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
+
 Replace texture [TEXTURE_NUM] with a 24 bit 512x512 or smaller image
 then click &quot;Set&quot; again.
                 </message>
         </alert>
         <alert modal="true" name="RawUploadStarted">
                 <message name="message">
-                        Upload started. It may take up to two minutes, 
+                        Upload started. It may take up to two minutes,
 depending on your connection speed.
                 </message>
         </alert>
         <alert modal="true" name="ConfirmBakeTerrain">
                 <message name="message">
-                        Do you really want to bake the current terrain, 
-make it the center for terrain raise/lower limits 
+                        Do you really want to bake the current terrain,
+make it the center for terrain raise/lower limits
 and the default for the &apos;Revert&apos; tool?
                 </message>
                 <option name="Bake">
@@ -2618,19 +2609,19 @@ and the default for the &apos;Revert&apos; tool?
         </alert>
         <alert modal="true" name="ClassifiedMustBeAlphanumeric">
                 <message name="message">
-                        The name of your classified must start with a letter 
+                        The name of your classified must start with a letter
 from A to Z or a number.  No punctuation is allowed.
                 </message>
         </alert>
         <alert modal="true" name="CantSetBuyObject">
                 <message name="message">
-                        Can&apos;t set Buy Object, because the object is not for sale. 
+                        Can&apos;t set Buy Object, because the object is not for sale.
 Please set the object for sale and try again.
                 </message>
         </alert>
         <alert modal="true" name="FinishedRawDownload">
                 <message name="message">
-                        Finished download of raw terrain file to: 
+                        Finished download of raw terrain file to:
 [DOWNLOAD_PATH]
                 </message>
         </alert>
@@ -2638,7 +2629,7 @@ Please set the object for sale and try again.
                 <message name="message">
                         A new version of [SECOND_LIFE] is available.
 [MESSAGE]
- 
+
 You must download this update to use the system.
                 </message>
                 <option name="Download">
@@ -2652,7 +2643,7 @@ You must download this update to use the system.
                 <message name="message">
                         An updated version of [SECOND_LIFE] is available.
 [MESSAGE]
- 
+
 This update is not required, but we suggest you install it to improve performance and stability.
                 </message>
                 <option name="Download">
@@ -2666,7 +2657,7 @@ This update is not required, but we suggest you install it to improve performanc
                 <message name="message">
                         An updated version of [SECOND_LIFE] is available.
 [MESSAGE]
- 
+
 This update is not required, but we suggest you install it to improve performance and stability.
                 </message>
                 <option name="Download">
@@ -2682,7 +2673,7 @@ This update is not required, but we suggest you install it to improve performanc
 [MESSAGE]
 
 You must download this update to use the system.
- 
+
 Download to your Applications folder?
                 </message>
                 <option name="Download">
@@ -2696,9 +2687,9 @@ Download to your Applications folder?
                 <message name="message">
                         An updated version of [SECOND_LIFE] is available.
 [MESSAGE]
- 
+
 This update is not required, but we suggest you install it to improve performance and stability.
- 
+
 Download to your Applications folder?
                 </message>
                 <option name="Download">
@@ -2712,9 +2703,9 @@ Download to your Applications folder?
                 <message name="message">
                         An updated version of [SECOND_LIFE] is available.
 [MESSAGE]
- 
+
 This update is not required, but we suggest you install it to improve performance and stability.
- 
+
 Download to your Applications folder?
                 </message>
                 <option name="Download">
@@ -2743,10 +2734,10 @@ Download to your Applications folder?
                 <message name="message">
                         Classified ads appear in the &apos;Classified&apos; section of the
 Find directory for one week.
- 
+
 Fill out your ad, then click &apos;Publish...&apos; to add it to the
 directory.
- 
+
 You&apos;ll be asked for a price to pay when clicking Publish.
 Paying more makes your ad appear higher in the list, and
 also appear higher when people search for keywords.
@@ -2775,6 +2766,62 @@ also appear higher when people search for keywords.
                         Cancel
                 </option>
         </alert>
+        <alert modal="true" name="WebLaunchBugReport101">
+                <message name="message">
+                        Visit the [SECOND_LIFE] Wiki and Learn how to Report Bugs Correctly.
+                </message>
+                <ignore>
+                        When launching web browser to view the Bug Reporting 101 Wiki
+                </ignore>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchSecurityIssues">
+                <message name="message">
+                        Visit the [SECOND_LIFE] Wiki for Details of How to Report a Security Issue.
+                </message>
+                <ignore>
+                        When launching web browser to view Security Issues Wiki
+                </ignore>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchPublicIssue">
+                <message name="message">
+                        Visit the [SECOND_LIFE] Public Issue Tracker, Where you can Report Bugs and other Issues.
+                </message>
+                <ignore>
+                        When launching web browser to view the Public Issue Tracker
+                </ignore>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
+        <alert modal="true" name="WebLaunchPublicIssueHelp">
+                <message name="message">
+                        Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
+                </message>
+                <ignore>
+                        When launching web browser to view Public Issue Tracker Wiki
+                </ignore>
+                <option name="Gotopage">
+                        Go to page
+                </option>
+                <option name="Cancel">
+                        Cancel
+                </option>
+        </alert>
         <alert modal="true" name="WebLaunchForums">
                 <message name="message">
                         Search the [SECOND_LIFE] Knowledge Base for the latest tips and tricks.
@@ -2865,7 +2912,7 @@ also appear higher when people search for keywords.
 objects to their owners? Transferable deeded
 objects will be returned to their previous owners.
 (All objects returned will return to the folder they were last in.)
- 
+
 *WARNING* No-transfer deeded objects will be deleted!
                 </message>
                 <ignore>
@@ -2931,7 +2978,7 @@ Leave Group?
         </alert>
         <alert modal="true" name="MuteByName" title="Mute object by name">
                 <message name="message">
-                        Mute by name only affects object chat and IM, not sounds. 
+                        Mute by name only affects object chat and IM, not sounds.
 You must type the object&apos;s name exactly.
                 </message>
                 <editline>
@@ -3173,13 +3220,13 @@ sent to everyone currently in your estate.
         </alert>
         <alert name="ChangeLindenEstate" title="Change Linden Estate">
                 <message name="message">
-                        You are about to change a Linden owned estate (mainland, 
-teen grid, orientation, etc.). 
- 
-This is EXTREMELY DANGEROUS because it can fundamentally 
-affect the user experience.  On the mainland, it will change 
+                        You are about to change a Linden owned estate (mainland,
+teen grid, orientation, etc.).
+
+This is EXTREMELY DANGEROUS because it can fundamentally
+affect the user experience.  On the mainland, it will change
 thousands of regions and make the spaceserver hiccup.
- 
+
 Proceed?
                 </message>
                 <option name="ChangeEstate">
@@ -3191,16 +3238,16 @@ Proceed?
         </alert>
         <alert name="ChangeLindenAccess" title="Change Linden Estate Access">
                 <message name="message">
-                        You are about to change the access list for a Linden owned 
-estate (mainland, teen grid, orientation, etc.). 
- 
-This is DANGEROUS and should only be done to invoke the 
-hack allowing objects/money to be transfered in/out of 
-a grid. 
- 
-It will change thousands of regions and make the 
-spaceserver hiccup. 
- 
+                        You are about to change the access list for a Linden owned
+estate (mainland, teen grid, orientation, etc.).
+
+This is DANGEROUS and should only be done to invoke the
+hack allowing objects/money to be transfered in/out of
+a grid.
+
+It will change thousands of regions and make the
+spaceserver hiccup.
+
 Proceed?
                 </message>
                 <option name="ChangeEstate">
@@ -3393,7 +3440,7 @@ Proceed?
         <alert name="PublishClassified">
                 <message name="message">
                         Remember: Classified ad fees are non-refundable.
- 
+
 Publish this classified now for L$[AMOUNT]?
                 </message>
                 <option name="Publish">
@@ -3431,7 +3478,7 @@ sent to everyone in this region.
                 <message name="message">
                         If this box is checked, land owners will not be able to terraform
 their land regardless of the per-parcel &apos;Edit Terrain&apos; setting.
- 
+
 Default: off
                 </message>
         </alert>
@@ -3439,7 +3486,7 @@ Default: off
                 <message name="message">
                         If this box is checked, people will not be able to fly in this region
 regardless of the per-parcel &apos;Fly&apos; setting.
- 
+
 Default: off
                 </message>
         </alert>
@@ -3447,18 +3494,18 @@ Default: off
                 <message name="message">
                         Checking this box enables the health system across all parcels
 regardless of individual parcel settings. If this box is left
-unchecked, individual parcel owners will still be able to 
+unchecked, individual parcel owners will still be able to
 activate the health system on their parcels.
- 
+
 Default: off
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionAgentLimit" title="Agent Limit">
                 <message name="message">
                         Sets the maximum number of avatars allowed in this region.
-Note that the more avatars you have in one region, the worse 
+Note that the more avatars you have in one region, the worse
 the performance can be.
- 
+
 Default: 30
                 </message>
         </alert>
@@ -3472,7 +3519,7 @@ allowed per region remains 15,000 no matter what the value set for
 Object Bonus. Once this value is set, it should not be lowered until
 you are certain that changing it will not force return or deletion of
 the objects currently on parcels.
- 
+
 Default: 1.0
                 </message>
         </alert>
@@ -3482,10 +3529,10 @@ Default: 1.0
 corner of the screen and in pop-up tips on the map.  Maturity
 also affects search results - residents can choose not to find
 content in Mature regions.
- 
-The pop-up tips on the map will not change for 5 minutes, because 
-the system only updates map information periodically. 
- 
+
+The pop-up tips on the map will not change for 5 minutes, because
+the system only updates map information periodically.
+
 Default: PG
                 </message>
         </alert>
@@ -3496,49 +3543,49 @@ Agents may only push themselves, or be pushed by scripts owned by
 the owner of a parcel, or that are set to the group of the parcel,
 assuming the parcel has a group set/deeded.
 Push refers to the llPushObject() LSL function.
- 
+
 Default: Off
                 </message>
         </alert>
         <alert modal="true" name="HelpParcelChanges" title="Parcel Join/Subdivide">
                 <message name="message">
                         Sets whether or not parcels not owned by the estate owner
-can be joined or subdivided. 
+can be joined or subdivided.
 If this option is unchecked:
- * Only estate owners or managers can join or subdivide parcels. 
- * They may only join or subdivide parcels belonging to the owner, 
+ * Only estate owners or managers can join or subdivide parcels.
+ * They may only join or subdivide parcels belonging to the owner,
        or to a group where they have the appropriate group powers.
 If this option is checked:
- * All parcel owners can join or subdivide the parcels they own. 
+ * All parcel owners can join or subdivide the parcels they own.
  * For group owned parcels, those with appropriate group powers
        may join or subdivide parcels.
- 
+
 Default: Checked
                 </message>
         </alert>
         <alert modal="true" name="RegionMaturityChange" title="Changed Region Maturity">
                 <message name="message">
-                        The maturity rating for this region has been updated. 
- 
-The world map, however, will take approximately 5 minutes 
-to update, because the system only updates map information 
+                        The maturity rating for this region has been updated.
+
+The world map, however, will take approximately 5 minutes
+to update, because the system only updates map information
 periodically.
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionLandResell" title="Land Resale">
                 <message name="message">
-                        Estate owners and managers can sell any land owned by the estate owner. 
-If this option is left unchecked, buyers cannot resell their land in this region. 
-If this option is checked, buyers can resell their land in this region. 
- 
+                        Estate owners and managers can sell any land owned by the estate owner.
+If this option is left unchecked, buyers cannot resell their land in this region.
+If this option is checked, buyers can resell their land in this region.
+
 Default: Disallow
                 </message>
         </alert>
         <alert modal="true" name="HelpEstateCovenantID" title="Covenant Asset ID">
                 <message name="message">
                         Sets the notecard asset ID for the Estate Covenant belonging to this
-estate. 
- 
+estate.
+
 Default: 00000000-0000-0000-0000-000000000000 or none
                 </message>
         </alert>
@@ -3546,200 +3593,200 @@ Default: 00000000-0000-0000-0000-000000000000 or none
                 <message name="message">
                         When sim performance is poor, a script may be to blame. Open the
 Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS.
-If it is lower than 45 then open the &apos;Time&apos; panel located at the 
-bottom of the Stats Bar. If Script Time reads 25 ms or higher, click 
-the &apos;Get Top Scripts&apos; button. You will be given the name and location 
+If it is lower than 45 then open the &apos;Time&apos; panel located at the
+bottom of the Stats Bar. If Script Time reads 25 ms or higher, click
+the &apos;Get Top Scripts&apos; button. You will be given the name and location
 of scripts that may be causing poor performance.
- 
-Checking the &apos;Disable Scripts&apos; box and then pressing the &apos;Apply&apos; 
-button will temporarily disable all scripts in this region. You may 
-need to do this in order to travel to the location of a noted 
-&apos;top script&apos;. Once you have arrived at the location, investigate the 
-script to determine if it is causing the problem. You may want to 
-contact the owner of the script or delete or return the object. 
-Uncheck the &apos;Disable Script&apos; box and then &apos;Apply&apos; to reactivate 
+
+Checking the &apos;Disable Scripts&apos; box and then pressing the &apos;Apply&apos;
+button will temporarily disable all scripts in this region. You may
+need to do this in order to travel to the location of a noted
+&apos;top script&apos;. Once you have arrived at the location, investigate the
+script to determine if it is causing the problem. You may want to
+contact the owner of the script or delete or return the object.
+Uncheck the &apos;Disable Script&apos; box and then &apos;Apply&apos; to reactivate
 the scripts in the region.
- 
+
 Default: off
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionDisableCollisions" title="Disable Collisions">
                 <message name="message">
-                        When sim performance is poor, physical objects may be to blame. 
-Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator 
-Physics FPS.  If it is lower than 45 then open the &apos;Time&apos; panel 
-located at the bottom of the Stats Bar. If Sim Time (Physics) 
-reads 20 ms or higher, click the &apos;Get Top Colliders&apos; button. 
-You will be given the name and location of physical objects 
+                        When sim performance is poor, physical objects may be to blame.
+Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator
+Physics FPS.  If it is lower than 45 then open the &apos;Time&apos; panel
+located at the bottom of the Stats Bar. If Sim Time (Physics)
+reads 20 ms or higher, click the &apos;Get Top Colliders&apos; button.
+You will be given the name and location of physical objects
 that may be causing poor performance.
- 
-Checking the &apos;Disable Collisions&apos; box and then pressing the &apos;Apply&apos; 
-button will temporarily disable object-object collisions. You may 
-need to do this in order to travel to the location of a noted 
-&apos;top collider&apos;. Once you have arrived at the location, investigate the 
-object - is it constantly colliding with other objects? You may want to 
-contact the owner of the object or delete or return the object. 
-Uncheck the &apos;Disable Collisions&apos; box and then &apos;Apply&apos; to reactivate 
+
+Checking the &apos;Disable Collisions&apos; box and then pressing the &apos;Apply&apos;
+button will temporarily disable object-object collisions. You may
+need to do this in order to travel to the location of a noted
+&apos;top collider&apos;. Once you have arrived at the location, investigate the
+object - is it constantly colliding with other objects? You may want to
+contact the owner of the object or delete or return the object.
+Uncheck the &apos;Disable Collisions&apos; box and then &apos;Apply&apos; to reactivate
 collisions in the region.
- 
+
 Default: off
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionDisablePhysics" title="Disable Physics">
                 <message name="message">
-                        Disable Physics is similar to Disable Collisions, except all 
-physics simulation is disabled.  This means that not only will 
-objects stop colliding, but avatars will be unable to move. 
- 
-This should only be used when Disable Collisions does not 
-give back enough performance to the region to investigate 
+                        Disable Physics is similar to Disable Collisions, except all
+physics simulation is disabled.  This means that not only will
+objects stop colliding, but avatars will be unable to move.
+
+This should only be used when Disable Collisions does not
+give back enough performance to the region to investigate
 a physics problem or &apos;Top Collider&apos;.
- 
-Be sure to re-enable physics when you are done, or avatars 
-will continue to be unable to move. 
- 
+
+Be sure to re-enable physics when you are done, or avatars
+will continue to be unable to move.
+
 Default: off
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionTopColliders" title="Top Colliders">
                 <message name="message">
-                        Show a list of objects experiencing the greatest number 
-of potential object-object collisions.  These objects can 
-slow sim performance.  Select View &gt; Statistics Bar and 
-look under Simulator &gt; Time &gt; Sim Time (Physics) to see 
+                        Show a list of objects experiencing the greatest number
+of potential object-object collisions.  These objects can
+slow sim performance.  Select View &gt; Statistics Bar and
+look under Simulator &gt; Time &gt; Sim Time (Physics) to see
 if more than 20 ms is being spent in physics.
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionTopScripts" title="Top Scripts">
                 <message name="message">
-                        Show a list of objects spending the most time running 
-LSL scripts.  These objects can slow sim performance. 
-Select View &gt; Statistics Bar and look under 
-Simulator &gt; Time &gt; Script Time to see if more than 
+                        Show a list of objects spending the most time running
+LSL scripts.  These objects can slow sim performance.
+Select View &gt; Statistics Bar and look under
+Simulator &gt; Time &gt; Script Time to see if more than
 25 ms is being spent in scripts.
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionRestart" title="Restart Region">
                 <message name="message">
-                        Restart the server process running this region after a 
-two minute warning.  All residents in the region will be 
-disconnected.  The region will save its data, and should 
-come back up within 90 seconds. 
- 
-Restarting the region will not fix most performance 
+                        Restart the server process running this region after a
+two minute warning.  All residents in the region will be
+disconnected.  The region will save its data, and should
+come back up within 90 seconds.
+
+Restarting the region will not fix most performance
 problems, and should usually be used only when directed.
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionWaterHeight" title="Water Height">
                 <message name="message">
-                        This is the height in meters where water appears. If 
-this setting is anything other than 20 and you have 
-water that is adjacent to the edge of world or &apos;void&apos; 
-water, there will be a visible gap. 
- 
+                        This is the height in meters where water appears. If
+this setting is anything other than 20 and you have
+water that is adjacent to the edge of world or &apos;void&apos;
+water, there will be a visible gap.
+
 Default: 20
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionTerrainRaise" title="Terrain Raise">
                 <message name="message">
-                        This is the distance that parcel owners can raise 
-their terrain above the &apos;baked&apos; terrain default 
-height. 
- 
+                        This is the distance that parcel owners can raise
+their terrain above the &apos;baked&apos; terrain default
+height.
+
 Default: 4
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionTerrainLower" title="Terrain Lower">
                 <message name="message">
-                        This is the distance that parcel owners can lower 
-their terrain below the &apos;baked&apos; terrain default 
-height. 
- 
+                        This is the distance that parcel owners can lower
+their terrain below the &apos;baked&apos; terrain default
+height.
+
 Default: -4
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionUploadRaw" title="Upload RAW Terrain">
                 <message name="message">
-                        This button uploads a .RAW file to the region you are in. 
-The file must have the correct dimensions/number of channels: 
-RGB, 256x256 and 13 channels.  The best way to create a 
-terrain file is to download the existing RAW file.  A good 
-first step is to modify the first channel (land height), 
-and upload it. 
- 
-The upload can take up to 45 seconds. Note that uploading a 
-terrain file *will not* move the objects that are on the land, 
-only the terrain itself and the permissions associated with the 
-parcels.  This can result in objects going underground. 
- 
-For more information on editing region height fields, go to: 
+                        This button uploads a .RAW file to the region you are in.
+The file must have the correct dimensions/number of channels:
+RGB, 256x256 and 13 channels.  The best way to create a
+terrain file is to download the existing RAW file.  A good
+first step is to modify the first channel (land height),
+and upload it.
+
+The upload can take up to 45 seconds. Note that uploading a
+terrain file *will not* move the objects that are on the land,
+only the terrain itself and the permissions associated with the
+parcels.  This can result in objects going underground.
+
+For more information on editing region height fields, go to:
 http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionDownloadRaw" title="Download RAW Terrain">
                 <message name="message">
-                        This button downloads a file containing the height field data, 
-parcel dimensions, parcel for sale status and some parcel permissions 
-for this region. When opening the file in a program such as 
-Photoshop you must specify the document&apos;s dimensions which 
-are: RGB, 256x256 with 13 channels. This terrain file cannot 
-be opened in any other way. 
- 
-For more information on editing region height fields, go to: 
+                        This button downloads a file containing the height field data,
+parcel dimensions, parcel for sale status and some parcel permissions
+for this region. When opening the file in a program such as
+Photoshop you must specify the document&apos;s dimensions which
+are: RGB, 256x256 with 13 channels. This terrain file cannot
+be opened in any other way.
+
+For more information on editing region height fields, go to:
 http://secondlife.com/tiki/tiki-index.php?page=RawTerrainFile
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionUseEstateSun" title="Use Estate Sun">
                 <message name="message">
-                        This checkbox makes the sun position in this region the 
-same as the sun position in the rest of the estate. 
- 
+                        This checkbox makes the sun position in this region the
+same as the sun position in the rest of the estate.
+
 Default: on
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionFixedSun" title="Fixed Sun">
                 <message name="message">
-                        This checkbox sets the sun position to the position 
-in the Phase slider and stops the sun from moving. 
- 
+                        This checkbox sets the sun position to the position
+in the Phase slider and stops the sun from moving.
+
 Default: off
                 </message>
         </alert>
         <alert modal="true" name="HelpRegionBakeTerrain" title="Bake Terrain">
                 <message name="message">
-                        This button saves the current shape of the terrain as the 
-new default for the region. Once baked, the land can revert 
+                        This button saves the current shape of the terrain as the
+new default for the region. Once baked, the land can revert
 to the saved shape whenever you or others use the Edit Terrain
-&apos;Revert&apos; option/tool. The baked terrain is also the middle 
+&apos;Revert&apos; option/tool. The baked terrain is also the middle
 point for the terrain raise and lower limits.
                 </message>
         </alert>
         <alert modal="true" name="HelpEstateEstateManager" title="Estate Managers">
                 <message name="message">
-                        An estate manager is a resident to whom you have delegated 
-control of region and estate settings.  An estate manager 
-can change any setting in these panels, except for uploading, 
-downloading, and baking terrain.  In particular, they can 
-allow or ban residents from your estate.  
- 
-Estate managers can only be added or removed by the owner 
-of the estate, not by each other.  Please only choose 
-residents you trust as estate managers, as you will be 
+                        An estate manager is a resident to whom you have delegated
+control of region and estate settings.  An estate manager
+can change any setting in these panels, except for uploading,
+downloading, and baking terrain.  In particular, they can
+allow or ban residents from your estate.
+
+Estate managers can only be added or removed by the owner
+of the estate, not by each other.  Please only choose
+residents you trust as estate managers, as you will be
 ultimately responsible for their actions.
                 </message>
         </alert>
         <alert modal="true" name="HelpEstateUseGlobalTime" title="Use Global Time">
                 <message name="message">
-                        This checkbox makes the sun in your estate follow 
-the same position as on the Linden-owned &apos;mainland&apos; 
-estates. 
- 
+                        This checkbox makes the sun in your estate follow
+the same position as on the Linden-owned &apos;mainland&apos;
+estates.
+
 Default: on
                 </message>
         </alert>
         <alert modal="true" name="HelpEstateFixedSun" title="Fixed Sun">
                 <message name="message">
-                        This checkbox sets the sun position to the position 
+                        This checkbox sets the sun position to the position
 in the Phase slider and stops the sun from moving.
                 </message>
         </alert>
@@ -3747,91 +3794,91 @@ in the Phase slider and stops the sun from moving.
                 <message name="message">
                         Sets whether residents who are on other estates can enter this
                          estate without being on an access list.
- 
+
 Default: on
                 </message>
         </alert>
         <alert modal="true" name="HelpEstateAllowDirectTeleport" title="Allow Direct Teleport">
                 <message name="message">
-                        When checked, allows residents to directly teleport to any 
-point in your estate.  When unchecked, residents teleport 
-to the nearest telehub. 
- 
+                        When checked, allows residents to directly teleport to any
+point in your estate.  When unchecked, residents teleport
+to the nearest telehub.
+
 Default: off
                 </message>
         </alert>
         <alert modal="true" name="HelpEstateAllowResident" title="Allow Access">
                 <message name="message">
-                        If any resident is listed here, access to the estate will be 
-limited to residents on this list and groups listed below. 
- 
-(If the estate is visible from the mainland, access cannot be 
-limited to a resident or group list, and these controls will be 
+                        If any resident is listed here, access to the estate will be
+limited to residents on this list and groups listed below.
+
+(If the estate is visible from the mainland, access cannot be
+limited to a resident or group list, and these controls will be
 disabled.  Only the &apos;access denied&apos; list will be used.)
                 </message>
         </alert>
         <alert modal="true" name="HelpEstateAllowGroup" title="Allow Group Access">
                 <message name="message">
-                        If any group is listed here, access to the estate will be 
-limited to the groups on this list and residents specifically 
-allowed above. 
- 
-(If the estate is visible from the mainland, access cannot be 
-limited to a resident or group list, and these controls will be 
+                        If any group is listed here, access to the estate will be
+limited to the groups on this list and residents specifically
+allowed above.
+
+(If the estate is visible from the mainland, access cannot be
+limited to a resident or group list, and these controls will be
 disabled.  Only the &apos;access denied&apos; list will be used.)
                 </message>
         </alert>
         <alert modal="true" name="HelpEstateBanResident" title="Deny Access">
                 <message name="message">
-                        Residents on this list are denied access to your estate, 
-regardless of the allow and group settings above. 
- 
-Adding a resident to this list will remove them from 
+                        Residents on this list are denied access to your estate,
+regardless of the allow and group settings above.
+
+Adding a resident to this list will remove them from
 the allow list.
                 </message>
         </alert>
         <alert modal="true" name="HelpEstateCovenant" title="Estate Covenant">
                 <message name="message">
-                        Setting an estate covenant enables you to sell parcels 
-within that estate. If a covenant is not set, you cannot 
-sell the land. The notecard for your covenant can be empty 
-if you do not wish to apply any rules or advise buyers of 
-anything in relation to the land before they buy it. 
- 
-A covenant can be used to communicate rules, guidelines, 
-cultural information or simply your own expectations to the 
-prospective buyer. This can include zoning, building regulations, 
-payment options or any other information you feel it is 
-important for the new owner to have seen and to have agreed 
-to before they purchase. 
- 
-The buyer must agree to the covenant by ticking the check box 
-before they will be able to finish the purchase. Estate 
-covenants are always visible in the About Land dialog for 
+                        Setting an estate covenant enables you to sell parcels
+within that estate. If a covenant is not set, you cannot
+sell the land. The notecard for your covenant can be empty
+if you do not wish to apply any rules or advise buyers of
+anything in relation to the land before they buy it.
+
+A covenant can be used to communicate rules, guidelines,
+cultural information or simply your own expectations to the
+prospective buyer. This can include zoning, building regulations,
+payment options or any other information you feel it is
+important for the new owner to have seen and to have agreed
+to before they purchase.
+
+The buyer must agree to the covenant by ticking the check box
+before they will be able to finish the purchase. Estate
+covenants are always visible in the About Land dialog for
 any parcels that have one set.
                 </message>
         </alert>
         <alert modal="true" name="BuyObjectOneOnly" title="Can&apos;t Buy Objects">
                 <message name="message">
-                        Unable to buy more than one object at a time. 
+                        Unable to buy more than one object at a time.
 Please select only one object and try again.
                 </message>
         </alert>
         <alert modal="true" name="BuyObjectOneOwner" title="Can&apos;t Buy Objects">
                 <message name="message">
-                        Cannot buy objects from different owners at the same time. 
+                        Cannot buy objects from different owners at the same time.
 Please select only one object and try again.
                 </message>
         </alert>
         <alert modal="true" name="BuyContentsOneOnly" title="Can&apos;t Buy Contents">
                 <message name="message">
-                        Unable to buy the contents of more than one object at a time. 
+                        Unable to buy the contents of more than one object at a time.
 Please select only one object and try again.
                 </message>
         </alert>
         <alert modal="true" name="BuyContentsOneOwner" title="Can&apos;t Buy Contents">
                 <message name="message">
-                        Cannot buy objects from different owners at the same time. 
+                        Cannot buy objects from different owners at the same time.
 Please select only one object and try again.
                 </message>
         </alert>
@@ -3936,9 +3983,9 @@ They will be copied to your inventory.
         <alert modal="true" name="ConfirmPurchase" nodefault="true">
                 <message name="message">
                         This transaction will:
- 
+
 [ACTION]
- 
+
 Are you sure you want to proceed with this purchase?
                 </message>
                 <option name="Confirm">
@@ -3951,9 +3998,9 @@ Are you sure you want to proceed with this purchase?
         <alert modal="true" name="ConfirmPurchasePassword" nodefault="true">
                 <message name="message">
                         This transaction will:
- 
+
 [ACTION]
- 
+
 Are you sure you want to proceed with this purchase?
 Please re-enter your password and click Confirm.
                 </message>
@@ -3980,7 +4027,7 @@ will retain their original values.
                 <message name="message">
                         You have selected &apos;no copy&apos; inventory items.
 These items will be moved to your inventory, not copied.
- 
+
 Move the inventory item(s)?
                 </message>
                 <ignore>
@@ -3995,12 +4042,12 @@ Move the inventory item(s)?
         </alert>
         <alert modal="true" name="MoveInventoryFromScriptedObject">
                 <message name="message">
-                        You have selected &apos;no copy&apos; inventory items.  These items 
+                        You have selected &apos;no copy&apos; inventory items.  These items
 will be moved to your inventory, not copied.
- 
-Because this object is scripted, moving these items 
-to your inventory may cause the script to malfunction. 
- 
+
+Because this object is scripted, moving these items
+to your inventory may cause the script to malfunction.
+
 Move the inventory item(s)?
                 </message>
                 <ignore>
@@ -4015,9 +4062,9 @@ Move the inventory item(s)?
         </alert>
         <alert name="ClickActionNotPayable">
                 <message name="message">
-                        Warning: The Pay Object click action has been set, but it 
-will only work if a script is added with a money() event. 
-This is because residents generally expect that objects 
+                        Warning: The Pay Object click action has been set, but it
+will only work if a script is added with a money() event.
+This is because residents generally expect that objects
 will react somehow when money is payed into them.
                 </message>
                 <ignore>
@@ -4045,48 +4092,48 @@ will react somehow when money is payed into them.
         </alert>
         <alert modal="true" name="HelpReportAbuseEmailLL" >
                 <message name="message">
-Use this tool to report violations of the Terms of Service 
-and Community Standards. See: 
+Use this tool to report violations of the Terms of Service
+and Community Standards. See:
 -
-http://secondlife.com/corporate/tos.php 
-http://secondlife.com/corporate/cs.php 
+http://secondlife.com/corporate/tos.php
+http://secondlife.com/corporate/cs.php
 -
-All reported abuses of the Terms of Service and Community Standards 
+All reported abuses of the Terms of Service and Community Standards
 are investigated and resolved. You will receive an email informing you
-of the resolution when it occurs. You can also view the incident 
+of the resolution when it occurs. You can also view the incident
 resolution on the Police Blotter at:
-- 
+-
 http://secondlife.com/community/blotter.php
                 </message>
         </alert>
         <alert modal="true" name="HelpReportAbuseEmailEO">
                 <message name="message">
-IMPORTANT: This report will go to the owner of the 
+IMPORTANT: This report will go to the owner of the
 region you are currently in and not to Linden Lab.
 -
-As a service to residents and visitors, the owner of 
-the region you are in has elected to receive and resolve 
-all reports originating in this region. Linden Lab will 
-not investigate reports you file from this location. 
-The region owner will resolve reports based on the local 
-rules of this region as outlined in the estate Covenant. 
-(View covenants by going to the World menu and selecting 
+As a service to residents and visitors, the owner of
+the region you are in has elected to receive and resolve
+all reports originating in this region. Linden Lab will
+not investigate reports you file from this location.
+The region owner will resolve reports based on the local
+rules of this region as outlined in the estate Covenant.
+(View covenants by going to the World menu and selecting
 About Land.)
 -
-The resolution of this report applies only to this Region; 
-Residents access to other areas of Second Life will not be 
-affected by the outcome of this report. Only Linden Lab can 
-restrict access to the entirety of Second Life.         
+The resolution of this report applies only to this Region;
+Residents access to other areas of Second Life will not be
+affected by the outcome of this report. Only Linden Lab can
+restrict access to the entirety of Second Life.
                 </message>
         </alert>
         <alert modal="true" name="HelpReportBug">
                 <message name="message">
-                        Use this tool to *only* report technical features that do not perform as 
-described or expected, please provide as much detail as possible, You 
+                        Use this tool to *only* report technical features that do not perform as
+described or expected, please provide as much detail as possible, You
 may reply to the auto-response email to add more details to your report.
 All bug reports are investigated and assessed. No email response will be sent.
 -
-If you are having a technical difficulty, please contact Support at: 
+If you are having a technical difficulty, please contact Support at:
 http://secondlife.com/community/support.php
 -
 Note: Incomplete reports will not be investigated
@@ -4095,42 +4142,42 @@ Note: Incomplete reports will not be investigated
         <alert modal="true" name="HelpReportAbuseSelectCategory">
                 <message name="message">
                         Please select a category for this abuse report.
- 
+
 Selecting a category helps us file and process abuse reports.
                 </message>
         </alert>
         <alert modal="true" name="HelpReportBugSelectCategory">
                 <message name="message">
                         Please select a category for this bug.
- 
+
 Selecting a category helps us file and process bug reports.
                 </message>
         </alert>
         <alert modal="true" name="HelpReportAbuseAbuserNameEmpty">
                 <message name="message">
                         Please enter the name of the abuser.
- 
+
 Entering an accurate value helps us file and process abuse reports.
                 </message>
         </alert>
         <alert modal="true" name="HelpReportAbuseAbuserLocationEmpty">
                 <message name="message">
                         Please enter the location where the abuse took place.
- 
+
 Entering an accurate value helps us file and process abuse reports.
                 </message>
         </alert>
         <alert modal="true" name="HelpReportAbuseSummaryEmpty">
                 <message name="message">
                         Please enter a summary of the abuse that took place.
- 
+
 Entering an accurate summary helps us file and process abuse reports.
                 </message>
         </alert>
         <alert modal="true" name="HelpReportBugSummaryEmpty">
                 <message name="message">
                         Please enter a summary of the bug.
- 
+
 Entering an accurate summary helps us file and process bug reports.
                 </message>
         </alert>
@@ -4139,7 +4186,7 @@ Entering an accurate summary helps us file and process bug reports.
                         Please enter a detailed description of the abuse that took place.
 Be as specific as you can, including names and the details of the
 incident you are reporting.
- 
+
 Entering an accurate description helps us file and process abuse reports.
                 </message>
         </alert>
@@ -4148,24 +4195,24 @@ Entering an accurate description helps us file and process abuse reports.
                         Please enter a detailed description of the bug.
 Be as specific as you can, including steps to reproduce the bug
 if possible.
- 
+
 Entering an accurate description helps us file and process bug reports.
                 </message>
         </alert>
         <alert modal="true" name="HelpReportAbuseContainsCopyright">
                 <message name="message">
                         Dear Resident,
- 
+
 Reports about copyright infringement can only be submitted
 as described at http://secondlife.com/corporate/dmca.php.
- 
+
 Reports concerning copyright infringement will automatically
 be discarded if they are submitted through the &apos;Abuse Report&apos;
 feature. If your report does not relate to copyright infringement,
 you may close this window and finish submitting your report.
- 
+
 Thank you,
- 
+
 Linden Lab
                 </message>
         </alert>
@@ -4195,7 +4242,7 @@ Do you want to replace it with the selected object?
                         You are in Busy Mode, which means you will not
 receive any items offered in exchange for
 this payment.
- 
+
 Would you like to leave Busy Mode before
 completing this transaction?
                 </message>
@@ -4242,9 +4289,9 @@ the contents of your Lost And Found folder?
         <alert modal="true" name="CopySLURL">
                 <message name="message">
                         The following SLURL has been copied to your clipboard:
-                        
-                         [SLURL] 
-                        
+
+                         [SLURL]
+
                         Put it in a web page to give others easy access to this location or
                         try it out yourself by pasting it into the address bar of your web browser.
                 </message>
@@ -4288,4 +4335,11 @@ the contents of your Lost And Found folder?
                     OK
                 </option>
         </alert>
+        <alert modal="true" name="Cannot_Purchase_an_Attachment">
+                <message name="message">
+                        Items may not be purchased while
+                        they are part of an attachment.
+                </message>
+        </alert>
+
 </alerts>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml b/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml
index a0e6a91..71a3bd4 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_avatar_picker.xml
@@ -6,7 +6,7 @@
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom="-40" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-             left="12" mouse_opaque="true" name="Type part of the person&apos;s name:"
+             left="12" mouse_opaque="true" name="Type part of the resident&apos;s name:"
              v_pad="0" width="220">
                 Type part of the resident&apos;s name:
         </text>
@@ -24,7 +24,7 @@
         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" hidden="false"
-             left="12" mouse_opaque="true" name="Or select a calling card:" v_pad="0"
+             left="12" mouse_opaque="true" name="Or select their calling card:" v_pad="0"
              width="220">
                 Or select a calling card:
         </text>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
index 52af7a3..d9d8eb8 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_inventory.xml
@@ -149,6 +149,11 @@
                              name="Folders Always By Name" width="118">
                                 <on_click filter="" function="Inventory.SetSortBy" userdata="foldersalwaysbyname" />
                         </menu_item_check>
+                        <menu_item_check bottom_delta="-18" control_name="Inventory.SystemFoldersToTop" height="18"
+                             hidden="false" label="System Folders To Top" left="0" mouse_opaque="true"
+                             name="System Folders To Top" width="118">
+                                <on_click filter="" function="Inventory.SetSortBy" userdata="systemfolderstotop" />
+                        </menu_item_check>
                 </menu>
                 <menu bottom_delta="28" color="0, 0, 0, 1" drop_shadow="true" height="49"
                      hidden="false" label="Filters" left="0" mouse_opaque="false" name="Filters"
diff --git a/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml b/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml
index 29d1fa2..773b54b 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_lsl_guide.xml
@@ -1,23 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

 <floater bottom="-500" can_close="true" can_drag_on_left="false" can_minimize="true"

      can_resize="true" enabled="true" follows="left|top" height="400"

      hidden="false" left="306" min_height="271" min_width="350"

-     mouse_opaque="true" name="script ed float"

+     mouse_opaque="true" name="script ed float" rect_control="LSLHelpRect"

      title="LSL Wiki" width="370">

-        <check_box bottom="-45" enabled="true" follows="top|left" font="SansSerif"

-             halign="center" height="20" hidden="false" label="Follow cursor"

-             left="10" mouse_opaque="true" name="lock_check" width="60" />

-        <combo_box bottom_delta="0" enabled="true" follows="top|left|right" font="SansSerif"

-             halign="center" height="20" hidden="false" label="Lock"

-             left_delta="100" mouse_opaque="true" name="history_combo"

-             width="90" />

+        <check_box bottom="-45" enabled="true" follows="top|left" font="SansSerif" halign="center"

+             height="20" hidden="false" label="Follow cursor" left="10"

+             mouse_opaque="true" name="lock_check" width="60" />

+        <combo_box allow_text_entry="true" bottom_delta="0" enabled="true"

+             follows="top|left|right" font="SansSerif" halign="center" height="20"

+             hidden="false" label="Lock" left_delta="100" mouse_opaque="true"

+             name="history_combo" width="90" />

         <button bottom_delta="0" enabled="true" follows="top|right" font="SansSerif"

-             halign="center" height="20" hidden="false" label="Back"

-             left_delta="95" mouse_opaque="true" name="back_btn"

-             width="70" />

+             halign="center" height="20" hidden="false" label="Back" left_delta="95"

+             mouse_opaque="true" name="back_btn" width="70" />

         <button bottom_delta="0" enabled="true" follows="top|right" font="SansSerif"

-             halign="center" height="20" hidden="false" label="Forward"

-             left_delta="75" mouse_opaque="true" name="fwd_btn"

-             width="70" />

-        <web_browser left="10" right="-10" follows="left|right|top|bottom" bottom="10" top="-50" name="lsl_guide_html"/>

+             halign="center" height="20" hidden="false" label="Forward" left_delta="75"

+             mouse_opaque="true" name="fwd_btn" width="70" />

+        <web_browser bottom="10" follows="left|right|top|bottom" left="10" name="lsl_guide_html"

+             right="-10" top="-50" />

 </floater>

diff --git a/linden/indra/newview/skins/xui/en-us/floater_mute.xml b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
index bb45932..132f53a 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_mute.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_mute.xml
@@ -11,8 +11,8 @@
              hidden="false" left="4" mouse_opaque="true" multi_select="false"
              name="mutes" tool_tip="List of currently muted residents" width="292" />
         <button bottom="-244" enabled="true" follows="left|bottom" font="SansSerif"
-             halign="center" height="20" hidden="false" label="Mute resident..."
-             label_selected="Mute resident..." left="4" mouse_opaque="true"
+             halign="center" height="20" hidden="false" label="Mute Resident..."
+             label_selected="Mute Resident..." left="4" mouse_opaque="true"
              name="Mute resident..." tool_tip="Pick a resident to mute" width="200" />
         <button bottom="-268" enabled="true" follows="left|bottom" font="SansSerif"
              halign="center" height="20" hidden="false" label="Mute object by name..."
diff --git a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
index 13e5f2e..13e5f2e 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_sell_land.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
index bd955e3..bd955e3 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_inventory.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml
index 66e12f0..66e12f0 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_attachment.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
index 91e27b7..91e27b7 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_avatar.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml
index cb06ebf..cb06ebf 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_land.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml
index e59ac38..e59ac38 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_object.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml b/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml
index 82113d4..82113d4 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_pie_self.xml
diff --git a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
index d964ec3..6d4840f 100755..100644
--- a/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/xui/en-us/menu_viewer.xml
@@ -39,6 +39,12 @@
                         <on_click function="File.CloseWindow" userdata="" />
                         <on_enable function="File.EnableCloseWindow" userdata="" />
                 </menu_item_call>
+                <menu_item_call bottom="-113" enabled="true" height="19" hidden="false" label="Close All Windows"
+                     left="0" mouse_opaque="true" name="Close All Windows" shortcut="control|shift|W"
+                     width="243">
+                        <on_click function="File.CloseAllWindows" userdata="" />
+                        <on_enable function="File.EnableCloseWindow" userdata="" />
+                </menu_item_call>
                 <menu_item_separator bottom="-121" enabled="true" height="8" hidden="false" label="-----------"
                      left="0" mouse_opaque="true" name="separator2" width="243" />
                 <menu_item_call bottom="-140" enabled="true" height="19" hidden="false"
@@ -771,12 +777,43 @@
                         <on_click function="Tools.SelectedScriptAction" userdata="stop" />
                         <on_enable function="EditableSelected" />
                 </menu_item_call>
-                <menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
-                left="0" mouse_opaque="true" name="separator6" width="250" />
-                <menu_item_call bottom="-240" enabled="true" height="19" hidden="false" label="Report Bug..."
+                        <menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
+                        left="0" mouse_opaque="true" name="separator7" width="250" />
+                        <menu bottom="-554" color="0 0 0 1" drop_shadow="true" enabled="true" height="109"
+                     hidden="false" label="Bug Reporting" left="0" mouse_opaque="false"
+                     name="Select Tool" opaque="true" tear_off="true" create_jump_keys="true"
+                     width="118">
+                        <menu_item_call bottom="-240" enabled="true" height="19" hidden="false" label="Report Bug..."
                     left="0" mouse_opaque="true" name="Report Bug..." width="166">
                         <on_click function="ShowFloater" userdata="bug reporter" />
-                </menu_item_call>
+                        </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
+                     label="Bug Reporting 101..." left="0" mouse_opaque="true"
+                     name="Bug Reporing 101..." width="166">
+                        <on_click function="PromptShowURL"
+                             userdata="WebLaunchBugReport101,https://wiki.secondlife.com/wiki/Bug_Reporting_101" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
+                     label="Security Issues..." left="0" mouse_opaque="true"
+                     name="Security Issues..." width="166">
+                        <on_click function="PromptShowURL"
+                             userdata="WebLaunchSecurityIssues,https://wiki.secondlife.com/wiki/Security_issues" />
+                        </menu_item_call>
+                        <menu_item_separator bottom="-411" enabled="true" height="8" hidden="false" label="-----------"
+                        left="0" mouse_opaque="true" name="separator7" width="250" />
+                        <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
+                     label="Public Issue Tracker..." left="0" mouse_opaque="true"
+                     name="Public Issue Tracker..." width="166">
+                        <on_click function="PromptShowURL"
+                             userdata="WebLaunchPublicIssue,https://jira.secondlife.com" />
+                        </menu_item_call>
+                        <menu_item_call bottom="-94" enabled="true" height="19" hidden="false"
+                     label="Public Issue Tracker Help..." left="0" mouse_opaque="true"
+                     name="Publc Issue Tracker Help..." width="166">
+                        <on_click function="PromptShowURL"
+                             userdata="WebLaunchPublicIssueHelp,https://wiki.secondlife.com/wiki/Issue_tracker" />
+                        </menu_item_call>
+                </menu>
         </menu>
         <menu bottom="219" color="0 0 0 1" drop_shadow="true" enabled="true" height="317"
              hidden="false" label="Help" left="227" mouse_opaque="false" name="Help"
diff --git a/linden/indra/newview/skins/xui/en-us/notify.xml b/linden/indra/newview/skins/xui/en-us/notify.xml
index 291b1b8..54451ab 100644
--- a/linden/indra/newview/skins/xui/en-us/notify.xml
+++ b/linden/indra/newview/skins/xui/en-us/notify.xml
@@ -420,7 +420,7 @@ No scripts will run except those belonging to the land owner.
         </notify>
         <notify name="ObjectGiveItem" tip="false">
                 <message name="message">
-                        An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.
+                        An object named [OBJECTFROMNAME] owned by [FIRST] [LAST] has given you a [OBJECTTYPE] named [OBJECTNAME].
                 </message>
                 <option name="Keep">
                         Keep
@@ -434,7 +434,7 @@ No scripts will run except those belonging to the land owner.
         </notify>
         <notify name="ObjectGiveItemUnknownUser" tip="false">
                 <message name="message">
-                        An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.
+                        An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME].
                 </message>
                 <option name="Keep">
                         Keep
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
index a92155a..8297887 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_general.xml
@@ -69,12 +69,11 @@
              label="Notify when Linden dollars (L$) spent or received" left="148"
              mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
              width="256" />
-        <check_box bottom="-326" control_name="ProbeHardwareOnStartup" enabled="true"
+        <check_box bottom="-326" control_name="ShowNewInventory" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
-             initial_value="false" label="Auto-detect graphics hardware on next startup"
-             left="148" mouse_opaque="true" name="probe_hardware_checkbox"
+             initial_value="false" label="Automatic previews of new notecards/textures/landmarks"
+             left="148" mouse_opaque="true" name="show_new_inventory"
              radio_style="false"
-             tool_tip="Second Life automatically configures some graphics settings based on your hardware.  If you install new hardware, you should have Second Life detect it again."
              width="270" />
         <check_box bottom="-344" control_name="UseDefaultColorPicker" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" hidden="false"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
index 3a1f32e..fd48f34 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_preferences_graphics3.xml
@@ -109,4 +109,11 @@
              increment="1" initial_val="1" label="Debug Beacon Line Width:"
              label_width="138" left="10" max_val="127" min_val="1" mouse_opaque="true"
              name="debug beacon line width" width="202" />
+        <check_box bottom="-304" control_name="ProbeHardwareOnStartup" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" hidden="false"
+             initial_value="false" label="Auto-detect graphics hardware on next startup"
+             left="148" mouse_opaque="true" name="probe_hardware_checkbox"
+             radio_style="false"
+             tool_tip="Second Life automatically configures some graphics settings based on your hardware.  If you install new hardware, you should have Second Life detect it again."
+             width="270" />
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
index 2ee26d1..9feaafc 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_status_bar.xml
@@ -18,7 +18,7 @@
              halign="right" height="18" hidden="false" left="-120" mouse_opaque="true"
              name="BalanceText" text_color="0 1 0 1" tool_tip="Account Balance"
              v_pad="2" width="76">
-                L$
+                Loading...
         </text>
         <button bottom="-18" enabled="true" follows="right|bottom" font="SansSerif"
              halign="center" height="16" hidden="false"