Second Life viewer sources 1.18.4.2-RC

7 files changed, 30 insertions, 24 deletions

diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 668a153..9bca7d5 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -3830,7 +3830,7 @@ in the Phase slider and stops the sun from moving.
         <alert modal="true" name="HelpEstateExternallyVisible" title="Public Access">
                 <message name="message">
                         This checkbox sets whether Residents who are on other estates can enter this
-                         estate without being on an access list.
+estate without being on an access list.
  
 Default: on
                 </message>
@@ -3847,17 +3847,17 @@ Default: off
         <alert modal="true" name="HelpEstateAllowResident" title="Allow Access">
                 <message name="message">
                         Access to this estate will be limited to Residents 
-                        listed here and any groups below.  This setting is 
-                        only available when Visible from Mainland is 
-                        unchecked.
+listed here and any groups below.  This setting is 
+only available when Visible from Mainland is 
+unchecked.
                 </message>
         </alert>
         <alert modal="true" name="HelpEstateAllowGroup" title="Allow Group Access">
                 <message name="message">
                         Access to this estate will be limited to groups 
-                        listed here and any Residents above.  This setting is 
-                        only available when Visible from Mainland is 
-                        unchecked.
+listed here and any Residents above.  This setting is 
+only available when Visible from Mainland is 
+unchecked.
                 </message>
         </alert>
         <alert modal="true" name="HelpEstateBanResident" title="Deny Access">
@@ -3869,10 +3869,10 @@ regardless of any other settings.
         <alert modal="true" name="HelpEstateVoiceChat" title="Allow Voice Chat">
             <message name="message">
                     Parcels in this estate are allowed to have their own voice
-                        channels in which residents may hear and talk with others
-                        nearby.
+channels in which residents may hear and talk with others
+nearby.
 
-                        Default: off
+Default: off
                 </message>
         </alert>
         <alert modal="true" name="VoiceVersionMismatch" title="Voice Version Mismatch">
@@ -4465,13 +4465,13 @@ the contents of your Lost And Found folder?
                 <message name="message">
                         Second Life doesn't know how to handle the link:
                         
-                         [SLURL]
+[SLURL]
                         
-                        Most links are similar to this:
+Most links are similar to this:
                         
-                         secondlife://app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
+secondlife://app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
                         
-                        Please check the spelling and try again.
+Please check the spelling and try again.
                 </message>
         </alert>
 </alerts>
diff --git a/linden/indra/newview/skins/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
index 8216069..7068b82 100644
--- a/linden/indra/newview/skins/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/xui/en-us/floater_directory.xml
@@ -114,7 +114,7 @@
                              label="Place an Ad..." label_selected="Place an Ad..." left_delta="320"
                              mouse_opaque="true" name="Place an Ad..." width="123" />
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="Delete" label_selected="Delete" left="212"
+                             height="20" label="Delete" label_selected="Delete" left="80"
                              mouse_opaque="true" name="Delete" width="80" />
                         <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
                              draw_heading="true" fg_disable_color="1, 1, 1, 1"
@@ -236,7 +236,7 @@
                              label="Search" label_selected="Search" left_delta="120" mouse_opaque="true"
                              name="Search" tool_tip="Search" width="80" />
                         <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-                             height="20" label="Delete" label_selected="Delete" left="212"
+                             height="20" label="Delete" label_selected="Delete" left="80"
                              mouse_opaque="true" name="Delete" width="80" />
                         <scroll_list background_visible="false" bottom="-513" column_padding="0" draw_border="true"
                              draw_heading="true" fg_disable_color="1, 1, 1, 1"
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
index 884ff6f..2e16380 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar.xml
@@ -41,7 +41,7 @@
                              text_readonly_color="1, 1, 1, 1" width="180" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-24" drop_shadow_visible="true" follows="left|top"
-                             font="SansSerifsmall" h_pad="0" halign="left" height="16" left_delta="209"
+                             font="SansSerifsmall" h_pad="0" halign="left" height="16" left="279"
                              mouse_opaque="true" name="online_yes" v_pad="0" width="121">
                                 Currently Online
                         </text>
@@ -153,10 +153,10 @@
                         <button bottom="-428" font="SansSerif" halign="center" height="20" label="Find on Map"
                              label_selected="Find on Map" left="24" mouse_opaque="true"
                              name="Find on Map" width="100" />
-                        <button bottom_delta="0" font="SansSerif" halign="center" height="20"
+                        <button bottom="-428" font="SansSerif" halign="center" height="20"
                              label="Offer Teleport..." label_selected="Offer Teleport..."
                              left_delta="102" mouse_opaque="true" name="Offer Teleport..." width="140" />
-                        <button bottom_delta="0" font="SansSerif" halign="center" height="20" label="Add Friend..."
+                        <button bottom="-428" font="SansSerif" halign="center" height="20" label="Add Friend..."
                              label_selected="Add Friend..." left_delta="142" mouse_opaque="true"
                              name="Add Friend..." width="130" />
                         <button bottom_delta="-24" font="SansSerif" halign="center" height="20" label="Pay..."
diff --git a/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml b/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
index 2effe70..607a07b 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_avatar_classified.xml
@@ -48,4 +48,6 @@
         <text hidden="true" name="ad_placed_paid">
                 Ad placed: [DATE], Paid L$[AMT] for listing.
         </text>
+        <text name="update_txt" hidden="true">Update</text>
+        <text name="publish_txt" hidden="true">Publish...</text>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place.xml b/linden/indra/newview/skins/xui/en-us/panel_place.xml
index 2cd1e79..06efe6c 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_place.xml
@@ -22,8 +22,8 @@
              name="map_btn" width="100" />
         <button bottom_delta="0" follows="left|top" height="20" label="Bids..." left="275"
              name="auction_btn" width="80" />
-        <text hidden="true" name="traffic_text">Traffic: [TRAFFIC].</text>
-        <text hidden="true" name="area_text"> Area: [AREA] sq. m.</text>
-        <text hidden="true" name="forsale_text"> For Sale for L$ [PRICE].</text>
-        <text hidden="true" name="auction_text"> Auction ID [ID].</text>
+        <string name="traffic_text">Traffic: [TRAFFIC]</string>
+        <string name="area_text">, Area: [AREA] sq. m.</string>
+        <string name="forsale_text">, For Sale for L$ [PRICE]</string>
+        <string name="auction_text">, Auction ID [ID].</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml b/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
index 6f9880c..f7523df 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_place_small.xml
@@ -22,4 +22,8 @@
              name="map_btn" width="100" />
         <button bottom_delta="0" follows="left|top" height="20" label="Bids..." left="275"
              name="auction_btn" width="80" />
+        <string name="traffic_text">Traffic: [TRAFFIC]</string>
+        <string name="area_text">, Area: [AREA] sq. m.</string>
+        <string name="forsale_text">, For Sale for L$ [PRICE]</string>
+        <string name="auction_text">, Auction ID [ID].</string>
 </panel>
diff --git a/linden/indra/newview/skins/xui/en-us/panel_region_general.xml b/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
index 5b2051a..045be99 100644
--- a/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
+++ b/linden/indra/newview/skins/xui/en-us/panel_region_general.xml
@@ -38,7 +38,7 @@
              label="Block Parcel Search" left="10" tool_tip="Let people see this region and its parcels in
 search results" name="block_parcel_search_check" width="80" />
         <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-             left="160" name="parcel_search_help" width="18" />
+             left="205" name="parcel_search_help" width="18" />
              
         <spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
              label="Agent Limit" label_width="97" left="10" max_val="100" min_val="0"