summaryrefslogtreecommitdiff
path: root/indra/newview/llchiclet.cpp
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-18 14:07:35 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-18 14:07:35 -0800
commitefb512dc65c43ea73e7b4da3e2c45d276043842e (patch)
tree3fcf738eb1c46c6c093f85dc7352d93ecbf13e0f /indra/newview/llchiclet.cpp
parent22aa5eed910bbd1b366789cb96247899c744df75 (diff)
EXT-2644 - Add "Close Session" option to chicklet context menus
Diffstat (limited to 'indra/newview/llchiclet.cpp')
-rw-r--r--indra/newview/llchiclet.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 4078fac4ec..5375c3ea49 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -482,6 +482,10 @@ void LLIMP2PChiclet::onMenuItemClicked(const LLSD& user_data)
{
LLAvatarActions::requestFriendshipDialog(other_participant_id);
}
+ else if("close" == level)
+ {
+ LLAvatarActions::endIM(other_participant_id);
+ }
}
//////////////////////////////////////////////////////////////////////////
@@ -776,12 +780,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);
+ }
}