diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llavataractions.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llcallingcard.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llgroupmgr.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 3 | 
4 files changed, 14 insertions, 1 deletions
| diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 25ba7c365f..93370ba9c3 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -78,6 +78,7 @@  #include "llsidepanelinventory.h"  #include "llavatarname.h"  #include "llagentui.h" +#include "lluiusage.h"  // Flags for kick message  const U32 KICK_FLAGS_DEFAULT	= 0x0; @@ -113,7 +114,7 @@ void LLAvatarActions::requestFriendshipDialog(const LLUUID& id, const std::strin  	payload["id"] = id;  	payload["name"] = name; -    	LLNotificationsUtil::add("AddFriendWithMessage", args, payload, &callbackAddFriendWithMessage); +	LLNotificationsUtil::add("AddFriendWithMessage", args, payload, &callbackAddFriendWithMessage);  	// add friend to recent people list  	LLRecentPeople::instance().add(id); @@ -1418,6 +1419,8 @@ bool LLAvatarActions::handleUnfreeze(const LLSD& notification, const LLSD& respo  void LLAvatarActions::requestFriendship(const LLUUID& target_id, const std::string& target_name, const std::string& message)  {  	const LLUUID calling_card_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CALLINGCARD); +	LLUIUsage::instance().logCommand("Avatar.SendFriendRequest"); +  	send_improved_im(target_id,  					 target_name,  					 message, diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp index fa7d5139ae..7d7c8ba0cd 100644 --- a/indra/newview/llcallingcard.cpp +++ b/indra/newview/llcallingcard.cpp @@ -53,6 +53,7 @@  #include "llviewerobjectlist.h"  #include "llvoavatar.h"  #include "llavataractions.h" +#include "lluiusage.h"  ///----------------------------------------------------------------------------  /// Local function declarations, constants, enums, and typedefs @@ -294,6 +295,8 @@ void LLAvatarTracker::copyBuddyList(buddy_map_t& buddies) const  void LLAvatarTracker::terminateBuddy(const LLUUID& id)  {  	LL_DEBUGS() << "LLAvatarTracker::terminateBuddy()" << LL_ENDL; +	LLUIUsage::instance().logCommand("Avatar.TerminateFriendship"); +  	LLRelationship* buddy = get_ptr_in_map(mBuddyInfo, id);  	if(!buddy) return;  	mBuddyInfo.erase(id); diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index 7f65153879..a9e5e55451 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -53,6 +53,7 @@  #include "llviewerregion.h"  #include <boost/regex.hpp>  #include "llcorehttputil.h" +#include "lluiusage.h"  #if LL_MSVC @@ -1859,6 +1860,9 @@ void LLGroupMgr::sendGroupRoleMemberChanges(const LLUUID& group_id)  //static  void LLGroupMgr::sendGroupMemberJoin(const LLUUID& group_id)  { + +	LLUIUsage::instance().logCommand("Group.Join"); +  	LLMessageSystem *msg = gMessageSystem;  	msg->newMessageFast(_PREHASH_JoinGroupRequest); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index be80d0bc0a..10710ae5f3 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -122,6 +122,7 @@  #include "llexperiencecache.h"  #include "llexperiencecache.h" +#include "lluiusage.h"  extern void on_new_message(const LLSD& msg); @@ -261,6 +262,7 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)  	    {  	    case 0:  	    { +			LLUIUsage::instance().logCommand("Avatar.AcceptFriendship");  		    // accept  		    LLAvatarTracker::formFriendship(payload["from_id"]); @@ -303,6 +305,7 @@ bool friendship_offer_callback(const LLSD& notification, const LLSD& response)  	    // fall-through  	    case 2: // Send IM - decline and start IM session  		    { +				LLUIUsage::instance().logCommand("Avatar.DeclineFriendship");  			    // decline  			    // We no longer notify other viewers, but we DO still send                  // the rejection to the simulator to delete the pending userop. | 
