From 8946aa9ee52397f7e15294970e9a651bb7f3a539 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sat, 23 Mar 2019 02:07:02 -0400 Subject: [PATCH] If a group starts with "Singularity ", mark it as a support session This is probably not the best way to go about this, but since we're not in control of support groups on other grids, and we have support groups in other languages we don't run on Second Life, this is better than maintaining a list of IDs somewhere. --- indra/newview/llimpanel.cpp | 8 +++++++- indra/newview/llimpanel.h | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index fdbb80c59..26a870690 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -65,6 +65,7 @@ #include "llviewerwindow.h" #include "llvoicechannel.h" +#include #include // [RLVa:KB] - Checked: 2013-05-10 (RLVa-1.4.9) @@ -331,7 +332,9 @@ LLFloaterIMPanel::LLFloaterIMPanel( { static LLCachedControl concise("UseConciseGroupChatButtons"); xml_filename = concise ? "floater_instant_message_group_concisebuttons.xml" : "floater_instant_message_group.xml"; - mSessionType = GROUP_SESSION; + bool support = boost::starts_with(mLogLabel, LLTrans::getString("SHORT_APP_NAME") + ' '); + // Singu Note: We could make a button feature for dumping Help->About contents for support, too. + mSessionType = support ? SUPPORT_SESSION : GROUP_SESSION; } else { @@ -1108,6 +1111,7 @@ void LLFloaterIMPanel::onFlyoutCommit(LLComboBox* flyout, const LLSD& value) { switch (mSessionType) { + case SUPPORT_SESSION: case GROUP_SESSION: LLGroupActions::show(mOtherParticipantUUID); return; case P2P_SESSION: LLAvatarActions::showProfile(mOtherParticipantUUID); return; default: onClickHistory(); return; // If there's no profile for this type, we should be the history button. @@ -1313,6 +1317,8 @@ void LLFloaterIMPanel::onSendMsg() case GROUP_SESSION: // Group chat fRlvFilter = !RlvActions::canSendIM(mSessionUUID); break; + case SUPPORT_SESSION: // Support Group, never filter, they may need help!! + break; case ADHOC_SESSION: // Conference chat: allow if all participants can be sent an IM { if (!mSpeakers) diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h index 6a2e54dbe..6a4dffc81 100644 --- a/indra/newview/llimpanel.h +++ b/indra/newview/llimpanel.h @@ -114,6 +114,7 @@ public: { P2P_SESSION, GROUP_SESSION, + SUPPORT_SESSION, ADHOC_SESSION }; const SType& getSessionType() const { return mSessionType; }