From 5e5240b697c7fdcb2ceb570fcaa25aca8d685932 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Thu, 25 Oct 2018 18:42:50 +0200 Subject: [PATCH] FIRE-23169: Fix offline inventory offers getting lost --- indra/newview/llimprocessing.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/newview/llimprocessing.cpp b/indra/newview/llimprocessing.cpp index c990437e9f..48d89d807b 100644 --- a/indra/newview/llimprocessing.cpp +++ b/indra/newview/llimprocessing.cpp @@ -2116,11 +2116,17 @@ void LLIMProcessing::requestOfflineMessages() { std::string cap_url = gAgent.getRegionCapability("ReadOfflineMsgs"); + // Optional legacy offline messages + if (!gSavedSettings.getBOOL("FSUseReadOfflineMsgsCap")) + { + cap_url = ""; + } + // + // Auto-accepted inventory items may require the avatar object // to build a correct name. Likewise, inventory offers from // muted avatars require the mute list to properly mute. if (cap_url.empty() - || gSavedSettings.getBOOL("FSUseReadOfflineMsgsCap") // Optional legacy offline messages || gAgent.getRegionCapability("AcceptFriendship").empty() || gAgent.getRegionCapability("AcceptGroupInvite").empty()) {