Second Life viewer sources 1.21.0-RC

1 files changed, 11 insertions, 7 deletions

diff --git a/linden/indra/newview/llfloaterbuy.cpp b/linden/indra/newview/llfloaterbuy.cpp
index 18d2913..5d815fa 100644
--- a/linden/indra/newview/llfloaterbuy.cpp
+++ b/linden/indra/newview/llfloaterbuy.cpp
@@ -52,7 +52,7 @@
 LLFloaterBuy* LLFloaterBuy::sInstance = NULL;
 
 LLFloaterBuy::LLFloaterBuy()
-:       LLFloater("floater_buy_object", "FloaterBuyRect", "")
+:       LLFloater(std::string("floater_buy_object"), std::string("FloaterBuyRect"), LLStringUtil::null)
 {
         LLUICtrlFactory::getInstance()->buildFloater(this, "floater_buy_object.xml");
 
@@ -132,7 +132,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
         sInstance->setTitle(title);
 
         LLUUID owner_id;
-        LLString owner_name;
+        std::string owner_name;
         BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
         if (!owners_identical)
         {
@@ -151,7 +151,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
         LLSD row;
 
         // Compute icon for this item
-        LLString icon_name = get_item_icon_name(LLAssetType::AT_OBJECT, 
+        std::string icon_name = get_item_icon_name(LLAssetType::AT_OBJECT, 
                                                                          LLInventoryType::IT_OBJECT,
                                                                          0x0, FALSE);
 
@@ -162,7 +162,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
         // Append the permissions that you will acquire (not the current
         // permissions).
         U32 next_owner_mask = node->mPermissions->getMaskNextOwner();
-        LLString text = node->mName;
+        std::string text = node->mName;
         if (!(next_owner_mask & PERM_COPY))
         {
                 text.append(sInstance->getString("no_copy_text"));
@@ -194,7 +194,6 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
         sInstance->requestVOInventory();
 }
 
-
 void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
                                                                  InventoryObjectList* inv,
                                                                  S32 serial_num,
@@ -256,7 +255,7 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
                         item_is_multi = TRUE;
                 }
 
-                LLString icon_name = get_item_icon_name(inv_item->getType(), 
+                std::string icon_name = get_item_icon_name(inv_item->getType(), 
                                                          inv_item->getInventoryType(),
                                                          inv_item->getFlags(),
                                                          item_is_multi);
@@ -267,7 +266,7 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
                 // Append the permissions that you will acquire (not the current
                 // permissions).
                 U32 next_owner_mask = inv_item->getPermissions().getMaskNextOwner();
-                LLString text = obj->getName();
+                std::string text = obj->getName();
                 if (!(next_owner_mask & PERM_COPY))
                 {
                         text.append(" (no copy)");
@@ -290,6 +289,11 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj,
         removeVOInventoryListener();
 }
 
+void LLFloaterBuy::close(bool app_quitting)
+{
+        LLSelectMgr::getInstance()->deselectAll();
+        LLFloater::close(app_quitting);
+}
 
 // static
 void LLFloaterBuy::onClickBuy(void*)