diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-05-15 21:15:05 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-05-15 21:15:05 +0000 |
| commit | ba9d38e3dddea24b840cea3eae24cf37466260e1 (patch) | |
| tree | 6719a655c5c46f896a92bcd1e3d46ec9e70318e2 | |
| parent | 03748c42aef82e0b07ee4a79f360fe4c0b15389a (diff) | |
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
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 9bdc25b1ee..dbb18f28bf 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -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 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; } |