livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Josh Bell 2007-05-15 21:15:05 +00:00
parent 03748c42ae
commit ba9d38e3dd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributions.txt
View File

@ -11,7 +11,7 @@ Drewan Keats - VWR-28
Dylan Haskell - VWR-72
Dzonatas Sol - VWR-198
Eddy Stryker - VWR-15, VWR-23
Gigs Taggart - VWR-71
Gigs Taggart - VWR-71, VWR-326
Ginko Bayliss - VWR-4
Hikkoshi Sakai - VWR-429
Hiro Sommambulist - VWR-66, VWR-97, VWR-100, VWR-105, VWR-108, VWR-118, VWR-136

4
indra/newview/llinventorymodel.cpp
View File

@ -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;
}