From 25c10ed028da5c547b11f1f461916897272b0e6d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 26 Jun 2008 00:39:00 +0000 Subject: QAR-628 merge string-cleanup-5 -r 90476:90508 -> release dataserver-is-deprecated --- indra/newview/llfloaterbuy.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/llfloaterbuy.cpp') diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp index 34bdaffd76..e64f218457 100644 --- a/indra/newview/llfloaterbuy.cpp +++ b/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")); @@ -256,7 +256,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 +267,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)"); -- cgit v1.2.3