Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer

2014-08-30 14:29:32 -04:00
parent 29195e8460 52a80f98ed
commit 5059d5e2da
24 changed files with 71 additions and 149 deletions
--- 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;