diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2024-08-13 15:48:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-13 15:48:26 +0300 |
| commit | 083212979d3fc0a2dd24fe795950e1d1a2251c73 (patch) | |
| tree | b9a9f7057fa1d1438db2b88761fcfd6a248516a5 /indra/newview/llgroupactions.cpp | |
| parent | ff601107f093e33f70e08a9453ed329e064ce45c (diff) | |
| parent | 9f2e322c7eea6830d372943d74f986d299cd314a (diff) | |
Merge pull request #2240 from secondlife/lua-groupchat
Lua api for sending group messages
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
| -rw-r--r-- | indra/newview/llgroupactions.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp index 24ae90e3ae..e901631d94 100644 --- a/indra/newview/llgroupactions.cpp +++ b/indra/newview/llgroupactions.cpp @@ -37,6 +37,7 @@ #include "llfloatersidepanelcontainer.h" #include "llgroupmgr.h" #include "llfloaterimcontainer.h" +#include "llfloaterimsession.h" #include "llimview.h" // for gIMMgr #include "llnotificationsutil.h" #include "llstartup.h" @@ -46,7 +47,7 @@ // // Globals // -static GroupChatListener sGroupChatListener; +static LLGroupChatListener sGroupChatListener; class LLGroupHandler : public LLCommandHandler { @@ -519,7 +520,10 @@ void LLGroupActions::endIM(const LLUUID& group_id) LLUUID session_id = gIMMgr->computeSessionID(IM_SESSION_GROUP_START, group_id); if (session_id != LLUUID::null) { - gIMMgr->leaveSession(session_id); + if (LLFloaterIMSession *conversationFloater = LLFloaterIMSession::findInstance(session_id)) + { + LLFloater::onClickClose(conversationFloater); + } } } |