summaryrefslogtreecommitdiff
path: root/indra/newview/llavataractions.cpp
diff options
context:
space:
mode:
authorSteve Bennetts <steve@lindenlab.com>2009-11-18 15:09:17 -0800
committerSteve Bennetts <steve@lindenlab.com>2009-11-18 15:09:17 -0800
commit3375a71ffbe27df4a90760ded6f3ac2050e38bfc (patch)
treef24d6ad08492fb3913f04b4c8a4806483c1e74b0 /indra/newview/llavataractions.cpp
parent81eca4a7823f7fa06327b8185b6603d1f3c9ac9a (diff)
parent2878328bb777ee6ffea252675cc2f5cfd64aed1f (diff)
merge
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())