From 5eac975c19f31ca484f1e3709a8dc331881919d0 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Wed, 14 Apr 2021 21:30:52 +0200
Subject: [PATCH] Don't include LSL bridge in wearables ordering check

---
 indra/newview/llappearancemgr.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 2a21fb9bae..e7dafbb7b8 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2698,6 +2698,19 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool enforce_item_restrictions,
 		LLInventoryModel::item_array_t cof_item_array;
 		get_sorted_base_and_cof_items(cof_item_array, outfit_item_array);
 
+		// <FS:Ansariel> Exclude LSL bridge or the following size check will always fail!
+		for (LLInventoryModel::item_array_t::iterator i = cof_item_array.begin(); i != cof_item_array.end(); ++i)
+		{
+			LLViewerInventoryItem *item = *i;
+
+			if (FSLSLBridge::instance().isBridgeValid() && item && item->getLinkedUUID() == FSLSLBridge::instance().getBridge()->getUUID())
+			{
+				cof_item_array.erase(i);
+				break;
+			}
+		}
+		// </FS:Ansariel>
+
 		if (outfit_item_array.size() == cof_item_array.size())
 		{
 			for (U32 i = 0; i < cof_item_array.size(); ++i)