From ba9d38e3dddea24b840cea3eae24cf37466260e1 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Tue, 15 May 2007 21:15:05 +0000 Subject: Merge all of the patches made to Branch_1-15-1 back into release: * Release notes for 1.15.1(3) * Updated contributors list * Revert apr libraries (NOTE: Also done in maintenance, this should be a no-op...) * Fix for SL-42640 Entering appearance mode triggers "items coming too fast" * Fix for SL-42257 Mute Resident button does not open the user picker svn merge -r 61568:61569 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61585:61586 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61601:61602 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61761:61762 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61777:61778 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61805:61806 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release svn merge -r 61824:61825 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-15-1 --> release --- indra/newview/llinventorymodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 8be81c944e..c34f14a813 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -3369,8 +3369,8 @@ void LLInventoryAddedObserver::changed(U32 mask) const char* msg_name = msg->getMessageName(); if (!msg_name) return; - if (!(!strcmp(msg_name, "UpdateCreateInventoryItem") - || !strcmp(msg_name, "FetchInventoryReply"))) + // We only want newly created inventory items. JC + if ( strcmp(msg_name, "UpdateCreateInventoryItem") ) { return; } -- cgit v1.2.3