diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-13 19:37:05 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-13 19:37:05 +0000 |
| commit | b9b4a4d9347053a3834ca2928063136948f09d1d (patch) | |
| tree | c2affaf017c2967989ff0b4a2b125d348736a04a /indra/newview/llfloaterfriends.cpp | |
| parent | 0a3b9e8e141a6f38ecbdf6020312e7a89b153bc4 (diff) | |
QAR-782 Merge featurettes batch #2
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llfloaterfriends.cpp')
| -rw-r--r-- | indra/newview/llfloaterfriends.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp index 46727c3698..c5823ce0de 100644 --- a/indra/newview/llfloaterfriends.cpp +++ b/indra/newview/llfloaterfriends.cpp @@ -573,16 +573,15 @@ void LLPanelFriends::onClickIM(void* user_data) } // static -void LLPanelFriends::requestFriendship(const LLUUID& target_id, const std::string& target_name) +void LLPanelFriends::requestFriendship(const LLUUID& target_id, const std::string& target_name, const std::string& message) { - // HACK: folder id stored as "message" LLUUID calling_card_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD); - std::string message = calling_card_folder_id.asString(); send_improved_im(target_id, target_name, message, IM_ONLINE, - IM_FRIENDSHIP_OFFERED); + IM_FRIENDSHIP_OFFERED, + calling_card_folder_id); } struct LLAddFriendData @@ -592,12 +591,12 @@ struct LLAddFriendData }; // static -void LLPanelFriends::callbackAddFriend(S32 option, void* data) +void LLPanelFriends::callbackAddFriend(S32 option, const std::string& text, void* data) { LLAddFriendData* add = (LLAddFriendData*)data; if (option == 0) { - requestFriendship(add->mID, add->mName); + requestFriendship(add->mID, add->mName, text); } delete add; } @@ -629,7 +628,7 @@ void LLPanelFriends::requestFriendshipDialog(const LLUUID& id, // TODO: accept a line of text with this dialog LLStringUtil::format_map_t args; args["[NAME]"] = name; - gViewerWindow->alertXml("AddFriend", args, callbackAddFriend, data); + gViewerWindow->alertXmlEditText("AddFriend", args, NULL, NULL, callbackAddFriend, data); } // static |