Skip to content

#5690 fix viewer trying to fetch group chat history for p2p IM #5718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxim-productengine merged 2 commits into from
Apr 27, 2026
+8 −4
Merged

#5690 fix viewer trying to fetch group chat history for p2p IM #5718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83c27ec
#5690 fix viewer trying to fetch group chat history for p2p IM
maxim-productengine Apr 27, 2026
0f9911f
#5690 cache "FetchGroupChatHistory" setting
maxim-productengine Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions indra/newview/llfloaterimsessiontab.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ class LLFloaterIMSessionTab
virtual void sessionVoiceOrIMStarted(const LLUUID& session_id) override {}; // Stub
virtual void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id) override {}; // Stub

bool isP2PSessionType() { return mIsP2PChat; }

protected:

// callback for click on any items of the visual states menu
Expand Down
10 changes: 6 additions & 4 deletions indra/newview/llimview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3253,8 +3253,9 @@ void LLIMMgr::addMessage(
return;
}

// Fetch group chat history, enabled by default.
if (gSavedPerAccountSettings.getBOOL("FetchGroupChatHistory"))
Copy link
Copy Markdown
Contributor

@akleshchev akleshchev Apr 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

addMessage can be fairly frequent. Not the 'once per frame' frequent, but might be better to cache the setting.

// Fetch group chat or ad-hoc history, enabled by default.
static LLCachedControl<bool> fetch_chat_history(gSavedPerAccountSettings, "FetchGroupChatHistory", true);
if (fetch_chat_history && !session->isP2PSessionType())
{
std::string chat_url = gAgent.getRegionCapability("ChatSessionRequest");
if (!chat_url.empty())
Expand Down Expand Up @@ -4097,8 +4098,9 @@ class LLViewerChatterBoxSessionStartReply : public LLHTTPNode
{
im_floater->processSessionUpdate(body["session_info"]);

// Send request for chat history, if enabled.
if (gSavedPerAccountSettings.getBOOL("FetchGroupChatHistory"))
// Send request for chat history, if enabled. Skip for peer-to-peer IMs.
static LLCachedControl<bool> fetch_chat_history(gSavedPerAccountSettings, "FetchGroupChatHistory", true);
if (fetch_chat_history && !im_floater->isP2PSessionType())
{
std::string url = gAgent.getRegionCapability("ChatSessionRequest");
if (!url.empty())
Expand Down
Loading