diff --git a/autobuild.xml b/autobuild.xml index c738ea6aef..bcb424112c 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -22,9 +22,9 @@ archive hash - aa31ee4c6315cb26bf6e2191b69598f5 + 1f887cbafc0fe2af1e85783de0f14102 url - http://3p.firestormviewer.org/jemalloc-5.1.0-linux64-190582149.tar.bz2 + http://3p.firestormviewer.org/jemalloc-5.2.1-linux64-210451204.tar.bz2 name linux64 diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index ea4e888a64..d3cc03914f 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -1061,13 +1061,7 @@ U32 LLInventoryModel::updateItem(const LLViewerInventoryItem* item, U32 mask) LLUUID new_parent_id = item->getParentUUID(); bool update_parent_on_server = false; -// if (new_parent_id.isNull() && !LLApp::isExiting()) -// [SL:KB] - Patch: Appearance-Misc | Checked: Catznip-6.4 - // The problem seems to be the 'LogoutReply' message so don't reparent anything to the LNF folder - // as soon as we've sent out the log out request (since the quitting state is only set >after< we - // start processing the logout response) - if ( (new_parent_id.isNull()) && (!LLAppViewer::instance()->logoutRequestSent()) && (!LLApp::isExiting()) ) -// [/SL:KB] + if (new_parent_id.isNull() && !LLApp::isExiting()) { if (old_parent_id.isNull()) {