From 960031909468045312017b8e0a6c52c5017cb55b Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Wed, 27 Aug 2014 07:58:08 -0400
Subject: [PATCH] Add debug setting LiruHighlightNewInventory to prevent
 selection being changed on accepting new inventory.

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llviewermessage.cpp       |  1 +
 2 files changed, 12 insertions(+)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 64861526c..8d90bea74 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -742,6 +742,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LiruHighlightNewInventory</key>
+    <map>
+      <key>Comment</key>
+      <string>When false, new inventory items will not be highlighted upon being accepted.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <boolean>1</boolean>
+    </map>
     <key>LiruLegacyDisplayMuteds</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 1c5ed208f..d1714d960 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1261,6 +1261,7 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam
 			LLInventoryView::showAgentInventory(TRUE);
 		}
 
+		if (!gSavedSettings.getBOOL("LiruHighlightNewInventory")) return;
 		////////////////////////////////////////////////////////////////////////////////
 		// Highlight item
 		LL_DEBUGS("Messaging") << "Highlighting" << obj_id  << LL_ENDL;