summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-07-25 17:14:17 -0700
committerMerov Linden <merov@lindenlab.com>2014-07-25 17:14:17 -0700
commit9c04a5bfbb56f2deb755da11ef261aad6491a46b (patch)
tree453779327e7f9cdd52b1b2307cc99145218a5e22 /indra
parent83603fc939e60c602773cc87e0b6fa316359d467 (diff)
DD-128 : Fixed. Do not allow items under the marketplace, even in inactive listings, to be worn.
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llinventoryfunctions.cpp2
1 files changed, 1 insertions, 1 deletions
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<LLFolderViewModelItemInventory *>((*set_iter)->getViewModelItem());
- if (viewModel && LLMarketplaceData::instance().isInActiveFolder(viewModel->getUUID()))
+ if (viewModel && (depth_nesting_in_marketplace(viewModel->getUUID()) >= 0))
{
break;
}