diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-04 16:13:07 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-04 16:13:07 -0800 |
commit | e1c5abce9309a89bd9993264bca8dadadf882c6f (patch) | |
tree | 81e1f91811b207abd4dfe4c82db31583d92df212 /indra/newview/llavataractions.cpp | |
parent | 33eac5dc0a1dfc0624dcfc75bec35155fbb9c917 (diff) | |
parent | 0bd2567bf5648808a95c7826581199bb371597cb (diff) |
merge with remote repo
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rw-r--r-- | indra/newview/llavataractions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 2f67401301..97e0aa5f46 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -343,7 +343,7 @@ bool LLAvatarActions::callbackAddFriend(const LLSD& notification, const LLSD& re // Servers older than 1.25 require the text of the message to be the // calling card folder ID for the offering user. JC LLUUID calling_card_folder_id = - gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD); + gInventory.findCategoryUUIDForType(LLFolderType::FT_CALLINGCARD); std::string message = calling_card_folder_id.asString(); requestFriendship(notification["payload"]["id"].asUUID(), notification["payload"]["name"].asString(), @@ -355,7 +355,7 @@ bool LLAvatarActions::callbackAddFriend(const LLSD& notification, const LLSD& re // static void LLAvatarActions::requestFriendship(const LLUUID& target_id, const std::string& target_name, const std::string& message) { - LLUUID calling_card_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD); + const LLUUID calling_card_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CALLINGCARD); send_improved_im(target_id, target_name, message, |