diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanelgroupinvite.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llpanelgroupinvite.cpp b/linden/indra/newview/llpanelgroupinvite.cpp index e051bb6..17312ef 100644 --- a/linden/indra/newview/llpanelgroupinvite.cpp +++ b/linden/indra/newview/llpanelgroupinvite.cpp | |||
@@ -71,13 +71,13 @@ public: | |||
71 | public: | 71 | public: |
72 | LLUUID mGroupID; | 72 | LLUUID mGroupID; |
73 | 73 | ||
74 | LLString mLoadingText; | 74 | std::string mLoadingText; |
75 | LLNameListCtrl *mInvitees; | 75 | LLNameListCtrl *mInvitees; |
76 | LLComboBox *mRoleNames; | 76 | LLComboBox *mRoleNames; |
77 | LLButton *mOKButton; | 77 | LLButton *mOKButton; |
78 | LLButton *mRemoveButton; | 78 | LLButton *mRemoveButton; |
79 | LLTextBox *mGroupName; | 79 | LLTextBox *mGroupName; |
80 | LLString mOwnerWarning; | 80 | std::string mOwnerWarning; |
81 | bool mConfirmedOwnerInvite; | 81 | bool mConfirmedOwnerInvite; |
82 | 82 | ||
83 | void (*mCloseCallback)(void* data); | 83 | void (*mCloseCallback)(void* data); |
@@ -158,7 +158,7 @@ void LLPanelGroupInvite::impl::submitInvitations() | |||
158 | // owner role: display confirmation and wait for callback | 158 | // owner role: display confirmation and wait for callback |
159 | if ((role_id == gdatap->mOwnerRole) && (!mConfirmedOwnerInvite)) | 159 | if ((role_id == gdatap->mOwnerRole) && (!mConfirmedOwnerInvite)) |
160 | { | 160 | { |
161 | LLString::format_map_t args; | 161 | LLStringUtil::format_map_t args; |
162 | args["[MESSAGE]"] = mOwnerWarning; | 162 | args["[MESSAGE]"] = mOwnerWarning; |
163 | gViewerWindow->alertXml("GenericAlertYesCancel", args, inviteOwnerCallback, this); | 163 | gViewerWindow->alertXml("GenericAlertYesCancel", args, inviteOwnerCallback, this); |
164 | return; // we'll be called again if user confirms | 164 | return; // we'll be called again if user confirms |
@@ -395,8 +395,8 @@ void LLPanelGroupInvite::addUsers(std::vector<LLUUID>& agent_ids) | |||
395 | LLViewerObject* dest = gObjectList.findObject(agent_id); | 395 | LLViewerObject* dest = gObjectList.findObject(agent_id); |
396 | if(dest && dest->isAvatar()) | 396 | if(dest && dest->isAvatar()) |
397 | { | 397 | { |
398 | LLString fullname; | 398 | std::string fullname; |
399 | LLString::format_map_t args; | 399 | LLStringUtil::format_map_t args; |
400 | LLNameValue* nvfirst = dest->getNVPair("FirstName"); | 400 | LLNameValue* nvfirst = dest->getNVPair("FirstName"); |
401 | LLNameValue* nvlast = dest->getNVPair("LastName"); | 401 | LLNameValue* nvlast = dest->getNVPair("LastName"); |
402 | if(nvfirst && nvlast) | 402 | if(nvfirst && nvlast) |