diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-02-20 14:20:43 +0200 | 
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-02-20 14:20:43 +0200 | 
| commit | a6b3bb1a2d7c0bac90918f75b67a8066d95a4783 (patch) | |
| tree | a3cf5bbc631da9e54459b32d7b4dba976a30ebb8 | |
| parent | da3fde24aa6fe06077dafeff6c7cafacaa50674a (diff) | |
MAINT-7146 No callback for 'Url.RemoveFriend' in LLScrollListCtrl
| -rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 7 | ||||
| -rw-r--r-- | indra/llui/llscrolllistctrl.h | 1 | 
2 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index db8fdc46b7..0afa8d43f1 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -1808,6 +1808,7 @@ BOOL LLScrollListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)  			registrar.add("Url.ShowProfile", boost::bind(&LLScrollListCtrl::showProfile, id, is_group));  			registrar.add("Url.SendIM", boost::bind(&LLScrollListCtrl::sendIM, id));  			registrar.add("Url.AddFriend", boost::bind(&LLScrollListCtrl::addFriend, id)); +			registrar.add("Url.RemoveFriend", boost::bind(&LLScrollListCtrl::removeFriend, id));  			registrar.add("Url.Execute", boost::bind(&LLScrollListCtrl::showNameDetails, id, is_group));  			registrar.add("Url.CopyLabel", boost::bind(&LLScrollListCtrl::copyNameToClipboard, id, is_group));  			registrar.add("Url.CopyUrl", boost::bind(&LLScrollListCtrl::copySLURLToClipboard, id, is_group)); @@ -1852,6 +1853,12 @@ void LLScrollListCtrl::addFriend(std::string id)  	LLUrlAction::addFriend(slurl);  } +void LLScrollListCtrl::removeFriend(std::string id) +{ +	std::string slurl = "secondlife:///app/agent/" + id + "/about"; +	LLUrlAction::removeFriend(slurl); +} +  void LLScrollListCtrl::showNameDetails(std::string id, bool is_group)  {  	// open the resident's details or the group details diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h index 6325a79cd5..8343750a54 100644 --- a/indra/llui/llscrolllistctrl.h +++ b/indra/llui/llscrolllistctrl.h @@ -432,6 +432,7 @@ private:  	static void		showProfile(std::string id, bool is_group);  	static void		sendIM(std::string id);  	static void		addFriend(std::string id); +	static void		removeFriend(std::string id);  	static void		showNameDetails(std::string id, bool is_group);  	static void		copyNameToClipboard(std::string id, bool is_group);  	static void		copySLURLToClipboard(std::string id, bool is_group);  | 
