Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ManagedMarketplace

Browse Source 
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lltooldraganddrop.h
This commit is contained in:
Lirusaito
2019-02-28 23:32:37 -05:00
parent c7ca3d9261 2b8c630922
commit fb39f2d511
217 changed files with 7047 additions and 1560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewermessage.cpp
View File

@@ -1667,7 +1667,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
// send the message
msg->sendReliable(mHost);
if (gSavedSettings.getBOOL("LogInventoryDecline"))
if (!mFromGroup && gSavedSettings.getBOOL("LogInventoryDecline"))
{
// [RLVa:KB] - Checked: 2010-09-23 (RLVa-1.2.1e) | Added: RLVa-1.2.1e
if ( (rlv_handler_t::isEnabled()) &&