diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 15:09:17 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-18 15:09:17 -0800 |
commit | 3375a71ffbe27df4a90760ded6f3ac2050e38bfc (patch) | |
tree | f24d6ad08492fb3913f04b4c8a4806483c1e74b0 /indra/newview/llgroupactions.cpp | |
parent | 81eca4a7823f7fa06327b8185b6603d1f3c9ac9a (diff) | |
parent | 2878328bb777ee6ffea252675cc2f5cfd64aed1f (diff) |
merge
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
-rw-r--r-- | indra/newview/llgroupactions.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index e60bde9fd8..f4e1951c7b 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -272,7 +272,7 @@ void LLGroupActions::closeGroup(const LLUUID& group_id) // static -void LLGroupActions::startChat(const LLUUID& group_id) +void LLGroupActions::startIM(const LLUUID& group_id) { if (group_id.isNull()) return; @@ -299,6 +299,19 @@ void LLGroupActions::startChat(const LLUUID& group_id) } // static +void LLGroupActions::endIM(const LLUUID& group_id) +{ + if (group_id.isNull()) + return; + + LLUUID session_id = gIMMgr->computeSessionID(IM_SESSION_GROUP_START, group_id); + if (session_id != LLUUID::null) + { + gIMMgr->leaveSession(session_id); + } +} + +// static bool LLGroupActions::isInGroup(const LLUUID& group_id) { // *TODO: Move all the LLAgent group stuff into another class, such as |