Merge

1 files changed, 11 insertions, 8 deletions

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 2758250175..3584074ec1 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1463,15 +1463,18 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 				// This is an offer from an agent. In this case, the back

 				// end has already copied the items into your inventory,

 				// so we can fetch it out of our inventory.

-				LLOpenAgentOffer* open_agent_offer = new LLOpenAgentOffer(mObjectID, from_string);

-				open_agent_offer->startFetch();

-				if(catp || (itemp && itemp->isFinished()))

+				if (gSavedSettings.getBOOL("ShowOfferedInventory"))

 				{

-					open_agent_offer->done();

-				}

-				else

-				{

-					opener = open_agent_offer;

+					LLOpenAgentOffer* open_agent_offer = new LLOpenAgentOffer(mObjectID, from_string);

+					open_agent_offer->startFetch();

+					if(catp || (itemp && itemp->isFinished()))

+					{

+						open_agent_offer->done();

+					}

+					else

+					{

+						opener = open_agent_offer;

+					}

 				}

 			}

 			break;