diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:30:05 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 14:30:05 -0800 |
| commit | 5fce305bc6fe2af96a1ad6e389d79b2bca43e37c (patch) | |
| tree | b3e24d1fc48749ef66f305881b8c4a930b776b2a /indra/newview/llchiclet.cpp | |
| parent | de23a4d92c02504fd512b2fdb151406d31ae03c0 (diff) | |
| parent | 3716d1bcf863f2b4dcb8c8de594a1aa95332ca9b (diff) | |
merge
Diffstat (limited to 'indra/newview/llchiclet.cpp')
| -rw-r--r-- | indra/newview/llchiclet.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index caf6917d90..ad9fd4badc 100644 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -474,6 +474,10 @@ void LLIMP2PChiclet::onMenuItemClicked(const LLSD& user_data) { LLAvatarActions::requestFriendshipDialog(other_participant_id); } + else if("close" == level) + { + LLAvatarActions::endIM(other_participant_id); + } } ////////////////////////////////////////////////////////////////////////// @@ -768,12 +772,16 @@ void LLIMGroupChiclet::onMenuItemClicked(const LLSD& user_data) if("group chat" == level) { - LLGroupActions::startChat(group_id); + LLGroupActions::startIM(group_id); } else if("info" == level) { LLGroupActions::show(group_id); } + else if("close" == level) + { + LLGroupActions::endIM(group_id); + } } |