aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatergroups.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloatergroups.cpp')
-rw-r--r--linden/indra/newview/llfloatergroups.cpp6
1 files changed, 3 insertions, 3 deletions
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()
389 if(i < count) 389 if(i < count)
390 { 390 {
391 LLUUID* cb_data = new LLUUID((const LLUUID&)group_id); 391 LLUUID* cb_data = new LLUUID((const LLUUID&)group_id);
392 LLString::format_map_t args; 392 LLStringUtil::format_map_t args;
393 args["[GROUP]"] = gAgent.mGroups.get(i).mName; 393 args["[GROUP]"] = gAgent.mGroups.get(i).mName;
394 gViewerWindow->alertXml("GroupLeaveConfirmMember", args, callbackLeaveGroup, (void*)cb_data); 394 gViewerWindow->alertXml("GroupLeaveConfirmMember", args, callbackLeaveGroup, (void*)cb_data);
395 } 395 }
@@ -440,7 +440,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
440 LLGroupData* group_datap = &gAgent.mGroups.get(i); 440 LLGroupData* group_datap = &gAgent.mGroups.get(i);
441 if ((powers_mask == GP_ALL_POWERS) || ((group_datap->mPowers & powers_mask) != 0)) 441 if ((powers_mask == GP_ALL_POWERS) || ((group_datap->mPowers & powers_mask) != 0))
442 { 442 {
443 LLString style = "NORMAL"; 443 std::string style = "NORMAL";
444 if(highlight_id == id) 444 if(highlight_id == id)
445 { 445 {
446 style = "BOLD"; 446 style = "BOLD";
@@ -459,7 +459,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
459 459
460 // add "none" to list at top 460 // add "none" to list at top
461 { 461 {
462 LLString style = "NORMAL"; 462 std::string style = "NORMAL";
463 if (highlight_id.isNull()) 463 if (highlight_id.isNull())
464 { 464 {
465 style = "BOLD"; 465 style = "BOLD";