1 files changed, 29 insertions, 21 deletions

diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index 891cde7..9707184 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -604,6 +604,25 @@ void LLPanelLandGeneral::refresh()
                 mBtnSellLand->setVisible(FALSE);
                 mBtnStopSellLand->setVisible(FALSE);
                 
+                // show pricing information
+                S32 area;
+                S32 claim_price;
+                S32 rent_price;
+                F32 dwell;
+                LLViewerParcelMgr::getInstance()->getDisplayInfo(&area,
+                                                                 &claim_price,
+                                                                 &rent_price,
+                                                                 &for_sale,
+                                                                 &dwell);
+
+                // Area
+                LLUIString price = getString("area_size_text");
+                price.setArg("[AREA]", llformat("%d",area));    
+                mTextPriceLabel->setText(getString("area_text"));
+                mTextPrice->setText(price.getString());
+
+                mTextDwell->setText(llformat("%.0f", dwell));
+
                 if (for_sale)
                 {
                         mSaleInfoForSale1->setVisible(TRUE);
@@ -619,7 +638,15 @@ void LLPanelLandGeneral::refresh()
                                 mSaleInfoForSaleNoObjects->setVisible(TRUE);
                         }
                         mSaleInfoNotForSale->setVisible(FALSE);
+
+                        F32 cost_per_sqm = 0.0f;
+                        if (area > 0)
+                        {
+                                cost_per_sqm = (F32)parcel->getSalePrice() / (F32)area;
+                        }
+
                         mSaleInfoForSale1->setTextArg("[PRICE]", llformat("%d", parcel->getSalePrice()));
+                        mSaleInfoForSale1->setTextArg("[PRICE_PER_SQM]", llformat("%.1f", cost_per_sqm));
                         if (can_be_sold)
                         {
                                 mBtnStopSellLand->setVisible(TRUE);
@@ -645,25 +672,6 @@ void LLPanelLandGeneral::refresh()
                 mBtnBuyGroupLand->setEnabled(
                         LLViewerParcelMgr::getInstance()->canAgentBuyParcel(parcel, true));
 
-                // show pricing information
-                S32 area;
-                S32 claim_price;
-                S32 rent_price;
-                F32 dwell;
-                LLViewerParcelMgr::getInstance()->getDisplayInfo(&area,
-                                                                   &claim_price,
-                                                                   &rent_price,
-                                                                   &for_sale,
-                                                                   &dwell);
-
-                // Area
-                LLUIString price = getString("area_size_text");
-                price.setArg("[AREA]", llformat("%d",area));    
-                mTextPriceLabel->setText(getString("area_text"));
-                mTextPrice->setText(price.getString());
-                
-                mTextDwell->setText(llformat("%.0f", dwell));
-
                 if(region_owner)
                 {
                         mBtnReclaimLand->setEnabled(
@@ -1448,7 +1456,7 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
                 msg->getBOOLFast(_PREHASH_Data, _PREHASH_IsGroupOwned,  is_group_owned, i);
                 msg->getS32Fast (_PREHASH_Data, _PREHASH_Count,                 object_count,   i);
                 msg->getBOOLFast(_PREHASH_Data, _PREHASH_OnlineStatus,  is_online,              i);
-                if(msg->getNumberOfBlocks("DataExtended"))
+                if(msg->has("DataExtended"))
                 {
                         msg->getU32("DataExtended", "TimeStamp", most_recent_time, i);
                 }