Merged in 1.2.0-landsqm

2 files changed, 14 insertions, 4 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index 87aea05..7668609 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -93,8 +93,8 @@
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-180" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="76"
-                             mouse_opaque="true" name="For Sale: Price L$[PRICE]." v_pad="0" width="206">
-                                Price: L$[PRICE].
+                             mouse_opaque="true" name="For Sale: Price L$[PRICE]." v_pad="0" width="246">
+                                Price: L$[PRICE] (L$[PRICE_PER_SQM]/sq.m.).
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-200" drop_shadow_visible="true" enabled="false" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
index a7fd3ed..a0c82f9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
@@ -86,13 +86,15 @@
         </text>
         <text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left_delta="50"
              name="info_price" right="400" >
-                L$ 1500, objects included
+                L$ 1500
+                (L$ 1.1/sq.m.)
+                sold with objects
         </text>
         <text bottom="-180" follows="top|left" font="SansSerifHuge" height="24" left="16"
              name="info_action" width="200">
                 Buying this land will:
         </text>
-        <pad height="10" />
+        <pad height="6" />
         <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
              name="step_error" width="64" />
         <text bottom_delta="-110" follows="top|left" height="160" left="72"
@@ -267,6 +269,14 @@ supports [AMOUNT2] objects
         <string name="sold_with_objects">
                 sold with objects
         </string>
+        <string name="sold_without_objects">
+                objects not included
+        </string>
+        <string name="info_price_string">
+                L$ [PRICE]
+(L$ [PRICE_PER_SQM]/sq.m.)
+[SOLD_WITH_OBJECTS]
+        </string>
         <string name="insufficient_land_credits">
                 The group [GROUP] will need sufficient contributed land use 
 credits to cover this parcel before the purchase will