From 9c04a5bfbb56f2deb755da11ef261aad6491a46b Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Fri, 25 Jul 2014 17:14:17 -0700 Subject: DD-128 : Fixed. Do not allow items under the marketplace, even in inactive listings, to be worn. --- indra/newview/llinventoryfunctions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index e31a6c8976..f009a6f7dd 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -1944,7 +1944,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root for (; set_iter != selected_items.end(); ++set_iter) { viewModel = dynamic_cast((*set_iter)->getViewModelItem()); - if (viewModel && LLMarketplaceData::instance().isInActiveFolder(viewModel->getUUID())) + if (viewModel && (depth_nesting_in_marketplace(viewModel->getUUID()) >= 0)) { break; } -- cgit v1.2.3