diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/llfloatergroups.cpp | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfloatergroups.cpp')
| -rw-r--r-- | indra/newview/llfloatergroups.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatergroups.cpp b/indra/newview/llfloatergroups.cpp index d67ae2de2d..a85b4ec0e9 100644 --- a/indra/newview/llfloatergroups.cpp +++ b/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); } @@ -439,7 +439,7 @@ void init_group_list(LLScrollListCtrl* ctrl, const LLUUID& highlight_id, U64 pow id = gAgent.mGroups.get(i).mID; LLGroupData* group_datap = &gAgent.mGroups.get(i); if ((group_datap->mPowers & powers_mask) != 0) { - LLString style = "NORMAL"; + std::string style = "NORMAL"; if(highlight_id == id) { style = "BOLD"; @@ -458,7 +458,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"; |