automated merge viewer-development -> mesh-development

7 files changed, 87 insertions, 87 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_buy_currency.xml b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
index 49deb9b025..9f6eac198b 100644
--- a/indra/newview/skins/default/xui/en/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/en/floater_buy_currency.xml
@@ -299,7 +299,7 @@ Re-enter amount to see the latest exchange rate.
      type="string"
      font="SansSerifHuge"
      left="165"
-     width="170"
+     width="360"
      height="25"
      top="25"
      name="info_cannot_buy">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index cdc462109c..ea09286592 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -180,14 +180,14 @@
      increment="1"
      initial_value="23"
      label="Nearby chat toasts life time:"
-     label_width="190"
+     label_width="285"
      layout="topleft"
      left="45"
      max_val="60"
      min_val="1"
      name="nearby_toasts_lifetime"
      top_pad="10"
-     width="230" />
+     width="325" />
     <spinner
      control_name="NearbyToastFadingTime"
      decimal_digits="0"
@@ -196,14 +196,14 @@
      increment="1"
      initial_value="3"
      label="Nearby chat toasts fading time:"
-     label_width="190"
+     label_width="285"
      layout="topleft"
      left_delta="0"
      max_val="60"
      min_val="0"
      name="nearby_toasts_fadingtime"
      top_pad="3"
-     width="230" />
+     width="325" />
     
     <check_box
      control_name="TranslateChat"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
index 8a37822413..7717872a6a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_colors.xml
@@ -47,7 +47,7 @@
    height="12"
    name="font_colors"
    top_pad="20"
-   width="120"
+   width="170"
    >
     Chat font colors:
   </text>
@@ -275,7 +275,7 @@
    height="12"
    name="bubble_chat"
    top_pad="20"
-   width="450"
+   width="495"
    >
     Name tag background color (also affects Bubble Chat):
   </text>
@@ -320,7 +320,7 @@
    height="12"
    name="floater_opacity"
    top_pad="15"
-   width="120"
+   width="200"
    >
     Floater Opacity:
   </text>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index f20ce52125..cefd1a5516 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -723,7 +723,7 @@
        follows="left|top"
        height="12"
        layout="topleft"
-       left="358"
+       left="388"
        left_pad="-30"
        name="TerrainDetailText"
         top="250"
@@ -735,7 +735,7 @@
        draw_border="false"
        height="38"
        layout="topleft"
-       left_delta="0"
+       left_delta="10"
        name="TerrainDetailRadio"
        top_pad="5"
        width="70">
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
index 04412bdb9c..1a8aae7f91 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml
@@ -195,7 +195,7 @@
      left="0"
      name="radio_teleport"
      top_delta="20"
-     width="100" />
+     width="110" />
     <radio_item
      height="16"
      label="Auto-pilot"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
index e374c89f21..91fe6f544c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml
@@ -341,7 +341,7 @@
      layout="topleft"
      left="25"
      name="voice_chat_settings"
-     width="180"
+     width="200"
      top_pad="7">
 	  Voice Chat Settings
     </text>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 2a6af23d3a..f8c90106b7 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -58,81 +58,81 @@
 	<string name="Quit">Quit</string>
 	<string name="create_account_url">http://join.secondlife.com/</string>
 
-	<string name="LoginFailedViewerNotPermitted">

-The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:

-http://secondlife.com/download

-

-For more information, see our FAQ below:

-http://secondlife.com/viewer-access-faq</string>

-	<string name="LoginIntermediateOptionalUpdateAvailable">Optional viewer update available: [VERSION]</string>

-	<string name="LoginFailedRequiredUpdate">Required viewer update: [VERSION]</string>

-	<string name="LoginFailedAlreadyLoggedIn">This agent is already logged in.

-</string>

-	<string name="LoginFailedAuthenticationFailed">Sorry! We couldn't log you in.

-Please check to make sure you entered the right

-    * Username (like bobsmith12 or steller.sunshine)

-    * Password

-Also, please make sure your Caps Lock key is off.</string>

-	<string name="LoginFailedPasswordChanged">As a security precaution your password has been changed.

-Please go to your account page at http://secondlife.com/password

-and answer the security question to reset your password.

-We are very sorry for the inconvenience.</string>

-	<string name="LoginFailedPasswordReset">We made some changes to our system and you will need to reset your password.

-Please go to your account page at http://secondlife.com/password

-and answer the security question to reset your password.

-We are very sorry for the inconvenience.</string>

-	<string name="LoginFailedEmployeesOnly">Second Life is temporarily closed for maintenance.

-Logins are currently restricted to employees only.

-Check www.secondlife.com/status for updates.</string>

-	<string name="LoginFailedPremiumOnly">Second Life logins are temporarily restricted in order to make sure that those in-world have the best possible experience.

-	 	

-People with free accounts will not be able to access Second Life during this time, to make room for those who have paid for Second Life.</string>

-	<string name="LoginFailedComputerProhibited">Second Life cannot be accessed from this computer.

-If you feel this is an error, please contact

-support@secondlife.com.</string>

-	<string name="LoginFailedAcountSuspended">Your account is not accessible until

-[TIME] Pacific Time.</string>

-	<string name="LoginFailedAccountDisabled">We are unable to complete your request at this time.

-Please contact Second Life support for assistance at http://secondlife.com/support.

-If you are unable to change your password, please call (866) 476-9763.</string>

-	<string name="LoginFailedTransformError">Data inconsistency found during login.

-Please contact support@secondlife.com.</string>

-	<string name="LoginFailedAccountMaintenance">Your account is undergoing minor maintenance.

-Your account is not accessible until

-[TIME] Pacific Time.

-If you feel this is an error, please contact support@secondlife.com.</string>

-	<string name="LoginFailedPendingLogoutFault">Request for logout responded with a fault from simulator.</string>

-	<string name="LoginFailedPendingLogout">The system is logging you out right now.

-Your Account will not be available until

-[TIME] Pacific Time.</string>

-	<string name="LoginFailedUnableToCreateSession">Unable to create valid session.</string>

-	<string name="LoginFailedUnableToConnectToSimulator">Unable to connect to a simulator.</string>

-	<string name="LoginFailedRestrictedHours">Your account can only access Second Life

-between [START] and [END] Pacific Time.

-Please come back during those hours.

-If you feel this is an error, please contact support@secondlife.com.</string>

-	<string name="LoginFailedIncorrectParameters">Incorrect parameters.

-If you feel this is an error, please contact support@secondlife.com.</string>

-	<string name="LoginFailedFirstNameNotAlphanumeric">First name parameter must be alphanumeric.

-If you feel this is an error, please contact support@secondlife.com.</string>

-	<string name="LoginFailedLastNameNotAlphanumeric">Last name parameter must be alphanumeric.

-If you feel this is an error, please contact support@secondlife.com.</string>

-	<string name="LogoutFailedRegionGoingOffline">Region is going offline.

-Please try logging in again in a minute.</string>

-	<string name="LogoutFailedAgentNotInRegion">Agent not in region.

-Please try logging in again in a minute.</string>

-	<string name="LogoutFailedPendingLogin">The region was logging in another session.

-Please try logging in again in a minute.</string>

-	<string name="LogoutFailedLoggingOut">The region was logging out the previous session.

-Please try logging in again in a minute.</string>

-	<string name="LogoutFailedStillLoggingOut">The region is still logging out the previous session.

-Please try logging in again in a minute.</string>

-	<string name="LogoutSucceeded">Region has logged out last session.

-Please try logging in again in a minute.</string>

-	<string name="LogoutFailedLogoutBegun">Region has begun the logout process.

-Please try logging in again in a minute.</string>

-	<string name="LoginFailedLoggingOutSession">The system has begun logging out your last session.

-Please try logging in again in a minute.</string>

+	<string name="LoginFailedViewerNotPermitted">
+The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer:
+http://secondlife.com/download
+
+For more information, see our FAQ below:
+http://secondlife.com/viewer-access-faq</string>
+	<string name="LoginIntermediateOptionalUpdateAvailable">Optional viewer update available: [VERSION]</string>
+	<string name="LoginFailedRequiredUpdate">Required viewer update: [VERSION]</string>
+	<string name="LoginFailedAlreadyLoggedIn">This agent is already logged in.
+</string>
+	<string name="LoginFailedAuthenticationFailed">Sorry! We couldn't log you in.
+Please check to make sure you entered the right
+    * Username (like bobsmith12 or steller.sunshine)
+    * Password
+Also, please make sure your Caps Lock key is off.</string>
+	<string name="LoginFailedPasswordChanged">As a security precaution your password has been changed.
+Please go to your account page at http://secondlife.com/password
+and answer the security question to reset your password.
+We are very sorry for the inconvenience.</string>
+	<string name="LoginFailedPasswordReset">We made some changes to our system and you will need to reset your password.
+Please go to your account page at http://secondlife.com/password
+and answer the security question to reset your password.
+We are very sorry for the inconvenience.</string>
+	<string name="LoginFailedEmployeesOnly">Second Life is temporarily closed for maintenance.
+Logins are currently restricted to employees only.
+Check www.secondlife.com/status for updates.</string>
+	<string name="LoginFailedPremiumOnly">Second Life logins are temporarily restricted in order to make sure that those in-world have the best possible experience.
+	 	
+People with free accounts will not be able to access Second Life during this time, to make room for those who have paid for Second Life.</string>
+	<string name="LoginFailedComputerProhibited">Second Life cannot be accessed from this computer.
+If you feel this is an error, please contact
+support@secondlife.com.</string>
+	<string name="LoginFailedAcountSuspended">Your account is not accessible until
+[TIME] Pacific Time.</string>
+	<string name="LoginFailedAccountDisabled">We are unable to complete your request at this time.
+Please contact Second Life support for assistance at http://secondlife.com/support.
+If you are unable to change your password, please call (866) 476-9763.</string>
+	<string name="LoginFailedTransformError">Data inconsistency found during login.
+Please contact support@secondlife.com.</string>
+	<string name="LoginFailedAccountMaintenance">Your account is undergoing minor maintenance.
+Your account is not accessible until
+[TIME] Pacific Time.
+If you feel this is an error, please contact support@secondlife.com.</string>
+	<string name="LoginFailedPendingLogoutFault">Request for logout responded with a fault from simulator.</string>
+	<string name="LoginFailedPendingLogout">The system is logging you out right now.
+Your Account will not be available until
+[TIME] Pacific Time.</string>
+	<string name="LoginFailedUnableToCreateSession">Unable to create valid session.</string>
+	<string name="LoginFailedUnableToConnectToSimulator">Unable to connect to a simulator.</string>
+	<string name="LoginFailedRestrictedHours">Your account can only access Second Life
+between [START] and [END] Pacific Time.
+Please come back during those hours.
+If you feel this is an error, please contact support@secondlife.com.</string>
+	<string name="LoginFailedIncorrectParameters">Incorrect parameters.
+If you feel this is an error, please contact support@secondlife.com.</string>
+	<string name="LoginFailedFirstNameNotAlphanumeric">First name parameter must be alphanumeric.
+If you feel this is an error, please contact support@secondlife.com.</string>
+	<string name="LoginFailedLastNameNotAlphanumeric">Last name parameter must be alphanumeric.
+If you feel this is an error, please contact support@secondlife.com.</string>
+	<string name="LogoutFailedRegionGoingOffline">Region is going offline.
+Please try logging in again in a minute.</string>
+	<string name="LogoutFailedAgentNotInRegion">Agent not in region.
+Please try logging in again in a minute.</string>
+	<string name="LogoutFailedPendingLogin">The region was logging in another session.
+Please try logging in again in a minute.</string>
+	<string name="LogoutFailedLoggingOut">The region was logging out the previous session.
+Please try logging in again in a minute.</string>
+	<string name="LogoutFailedStillLoggingOut">The region is still logging out the previous session.
+Please try logging in again in a minute.</string>
+	<string name="LogoutSucceeded">Region has logged out last session.
+Please try logging in again in a minute.</string>
+	<string name="LogoutFailedLogoutBegun">Region has begun the logout process.
+Please try logging in again in a minute.</string>
+	<string name="LoginFailedLoggingOutSession">The system has begun logging out your last session.
+Please try logging in again in a minute.</string>
 
 
 	<!-- Disconnection -->