From 6b40206279acb608166ae24852b83b1127310800 Mon Sep 17 00:00:00 2001
From: andreykproductengine <akleshchev@productengine.com>
Date: Tue, 1 Jul 2014 18:33:23 +0300
Subject: MAINT-4086 FIXED Limit the number items "Replace Current Outfit" or
 "Wear" applies to

---
 indra/newview/lltooldraganddrop.cpp            | 28 ++++++++++++++++++++++++++
 indra/newview/lltooldraganddrop.h              |  1 +
 indra/newview/skins/default/xui/en/strings.xml |  1 +
 3 files changed, 30 insertions(+)

(limited to 'indra/newview')

diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index eabf6f0497..575e5c5c52 100755
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -513,6 +513,7 @@ void LLToolDragAndDrop::onMouseCaptureLost()
 	mSource = SOURCE_AGENT;
 	mSourceID.setNull();
 	mObjectID.setNull();
+	mCustomMsg.clear();
 }
 
 BOOL LLToolDragAndDrop::handleMouseUp( S32 x, S32 y, MASK mask )
@@ -556,6 +557,12 @@ ECursorType LLToolDragAndDrop::acceptanceToCursor( EAcceptance acceptance )
 		mCursor = UI_CURSOR_NOLOCKED;
 		break;
 
+	case ACCEPT_NO_CUSTOM:
+		mToolTipMsg = mCustomMsg;
+		mCursor = UI_CURSOR_NO;
+		break;
+
+
 	case ACCEPT_NO:
 		mCursor = UI_CURSOR_NO;
 		break;
@@ -630,6 +637,7 @@ BOOL LLToolDragAndDrop::handleToolTip(S32 x, S32 y, MASK mask)
 void LLToolDragAndDrop::handleDeselect()
 {
 	mToolTipMsg.clear();
+	mCustomMsg.clear();
 
 	LLToolTipMgr::instance().blockToolTips();
 }
@@ -2164,6 +2172,26 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory(
 		// TODO: investigate wearables may not be loaded at this point EXT-8231
 	}
 
+	U32 max_items = gSavedSettings.getU32("WearFolderLimit");
+	if (category->getDescendentCount()>max_items)
+	{
+		LLInventoryModel::cat_array_t cats;
+		LLInventoryModel::item_array_t items;
+		LLFindWearablesEx not_worn(/*is_worn=*/ false, /*include_body_parts=*/ false);
+		gInventory.collectDescendentsIf(category->getUUID(),
+			cats,
+			items,
+			LLInventoryModel::EXCLUDE_TRASH,
+			not_worn);
+		if (items.size() > max_items)
+		{
+			LLStringUtil::format_map_t args;
+			args["AMOUNT"] = llformat("%d", max_items);
+			mCustomMsg = LLTrans::getString("TooltipTooManyWearables",args);
+			return ACCEPT_NO_CUSTOM;
+		}
+	}
+
 	if(mSource == SOURCE_AGENT)
 	{
 		const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h
index 99b794ce58..de501ea32a 100755
--- a/indra/newview/lltooldraganddrop.h
+++ b/indra/newview/lltooldraganddrop.h
@@ -149,6 +149,7 @@ protected:
 	BOOL			mDrop;
 	S32				mCurItemIndex;
 	std::string		mToolTipMsg;
+	std::string		mCustomMsg;
 
 	enddrag_signal_t	mEndDragSignal;
 
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index fca4a5cddc..f0349f54b7 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -233,6 +233,7 @@ Please try logging in again in a minute.</string>
 	<string name="TooltipFlagNoScripts">No Scripts</string>
 	<string name="TooltipLand">Land:</string>
 	<string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>
+	<string name="TooltipTooManyWearables">You can't wear a folder containing more than [AMOUNT] items.  You can change this limit in Advanced > Show Debug Settings > WearFolderLimit.</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]: "/>
 
 	<string name="TooltipOutboxDragToWorld">You can not rez items in your merchant outbox</string>
-- 
cgit v1.2.3