From 719158dac444f023ccbfa08906e5e27796cf7e2e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 14 Feb 2021 16:09:48 +0100 Subject: [PATCH] Undo needless check --- indra/newview/llinventorymodel.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) 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()) {