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 01624c6..39f6b7a 100644
--- a/linden/indra/newview/llfloatergroups.cpp
+++ b/linden/indra/newview/llfloatergroups.cpp
@@ -406,7 +406,7 @@ void LLPanelGroups::leave()
406 if(i < count) 406 if(i < count)
407 { 407 {
408 LLUUID* cb_data = new LLUUID((const LLUUID&)group_id); 408 LLUUID* cb_data = new LLUUID((const LLUUID&)group_id);
409 LLString::format_map_t args; 409 LLStringUtil::format_map_t args;
410 args["[GROUP]"] = gAgent.mGroups.get(i).mName; 410 args["[GROUP]"] = gAgent.mGroups.get(i).mName;
411 gViewerWindow->alertXml("GroupLeaveConfirmMember", args, callbackLeaveGroup, (void*)cb_data); 411 gViewerWindow->alertXml("GroupLeaveConfirmMember", args, callbackLeaveGroup, (void*)cb_data);
412 } 412 }
@@ -472,7 +472,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
472 LLGroupData* group_datap = &gAgent.mGroups.get(i); 472 LLGroupData* group_datap = &gAgent.mGroups.get(i);
473 if ((powers_mask == GP_ALL_POWERS) || ((group_datap->mPowers & powers_mask) != 0)) 473 if ((powers_mask == GP_ALL_POWERS) || ((group_datap->mPowers & powers_mask) != 0))
474 { 474 {
475 LLString style = "NORMAL"; 475 std::string style = "NORMAL";
476 if(highlight_id == id) 476 if(highlight_id == id)
477 { 477 {
478 style = "BOLD"; 478 style = "BOLD";
@@ -491,7 +491,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow
491 491
492 // add "none" to list at top 492 // add "none" to list at top
493 { 493 {
494 LLString style = "NORMAL"; 494 std::string style = "NORMAL";
495 if (highlight_id.isNull()) 495 if (highlight_id.isNull())
496 { 496 {
497 style = "BOLD"; 497 style = "BOLD";