QAR-628 merge string-cleanup-5 -r 90476:90508 -> release

dataserver-is-deprecated

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index 21ed153920..4a996a9c06 100644
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -346,7 +346,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 	////////////////
 	if(perm.isOwned())
 	{
-		LLString name;
+		std::string name;
 		if (perm.isGroupOwned())
 		{
 			gCacheName->getGroupName(perm.getGroup(), name);
@@ -380,7 +380,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 	}
 	else
 	{
-		childSetText("LabelAcquiredDate", LLString(ctime(&time_utc)) );
+		childSetText("LabelAcquiredDate", std::string(ctime(&time_utc)) );
 	}
 
 	///////////////////////
@@ -942,7 +942,7 @@ void LLFloaterProperties::closeByID(const LLUUID& item_id, const LLUUID &object_
 /// LLMultiProperties
 ///----------------------------------------------------------------------------
 
-LLMultiProperties::LLMultiProperties(const LLRect &rect) : LLMultiFloater("Properties", rect)
+LLMultiProperties::LLMultiProperties(const LLRect &rect) : LLMultiFloater(std::string("Properties"), rect)
 {
 }