Deferring work to idle time to avoid recursive notifyObservers calls - added wrapper class to defer an arbitrary boost::bind or other callable

--HG--
branch : avatar-pipeline

1 files changed, 12 insertions, 0 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index d7be09efa9..f406547620 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1682,6 +1682,17 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 			// if target is an outfit or current outfit folder we use link

 			if (move_is_into_current_outfit || move_is_into_outfit)

 			{

+				if (inv_cat->getPreferredType() == LLFolderType::FT_NONE)

+				{

+					if (move_is_into_current_outfit)

+					{

+						// traverse category and add all contents to currently worn.

+						BOOL append = true;

+						LLAppearanceManager::instance().wearInventoryCategory(inv_cat, false, append);

+					}

+				}

+				else

+				{

 #if SUPPORT_ENSEMBLES

 				// BAP - should skip if dup.

 				if (move_is_into_current_outfit)

@@ -1700,6 +1711,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 						cb);

 				}

 #endif

+				}

 			}

 			else

 			{