summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-11-19 13:36:27 -0500
committerLoren Shih <seraph@lindenlab.com>2009-11-19 13:36:27 -0500
commitafbc78d0398d58c44b2b1fb692ce1a27577fc4b1 (patch)
treeda4c6c1bd6e87b81b10a5b7bed6429373e6a89eb /indra/newview/llavataractions.cpp
parent6cea252986ef6d33f2e37333a286362b8e0272c5 (diff)
parent3e46ee6274d04d91657da92953b167fe94eb7f59 (diff)
Merging viewer-2-0 changes into avatar-pipeline branch
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llavataractions.cpp')
-rw-r--r--indra/newview/llavataractions.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp
index ee4a9df15f..0844cca766 100644
--- a/indra/newview/llavataractions.cpp
+++ b/indra/newview/llavataractions.cpp
@@ -190,6 +190,19 @@ void LLAvatarActions::startIM(const LLUUID& id)
}
// static
+void LLAvatarActions::endIM(const LLUUID& id)
+{
+ if (id.isNull())
+ return;
+
+ LLUUID session_id = gIMMgr->computeSessionID(IM_NOTHING_SPECIAL, id);
+ if (session_id != LLUUID::null)
+ {
+ gIMMgr->leaveSession(session_id);
+ }
+}
+
+// static
void LLAvatarActions::startCall(const LLUUID& id)
{
if (id.isNull())