From 798d367d54a6c6379ad355bd8345fa40e31e7fe9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Sep 2008 18:24:57 -0500
Subject: Second Life viewer sources 1.21.0-RC

---
 linden/indra/newview/llfloatergroups.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/llfloatergroups.cpp')

diff --git a/linden/indra/newview/llfloatergroups.cpp b/linden/indra/newview/llfloatergroups.cpp
index f6e226d..c0ea9df 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -389,7 +389,7 @@ void LLPanelGroups::leave()
 		if(i < count)
 		{
 			LLUUID* cb_data = new LLUUID((const LLUUID&)group_id);
-			LLString::format_map_t args;
+			LLStringUtil::format_map_t args;
 			args["[GROUP]"] = gAgent.mGroups.get(i).mName;
 			gViewerWindow->alertXml("GroupLeaveConfirmMember", args, callbackLeaveGroup, (void*)cb_data);
 		}
@@ -440,7 +440,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
 		LLGroupData* group_datap = &gAgent.mGroups.get(i);
 		if ((powers_mask == GP_ALL_POWERS) || ((group_datap->mPowers & powers_mask) != 0))
 		{
-			LLString style = "NORMAL";
+			std::string style = "NORMAL";
 			if(highlight_id == id)
 			{
 				style = "BOLD";
@@ -459,7 +459,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
 
 	// add "none" to list at top
 	{
-		LLString style = "NORMAL";
+		std::string style = "NORMAL";
 		if (highlight_id.isNull())
 		{
 			style = "BOLD";
-- 
cgit v1.1