diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-08-19 22:34:06 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-08-19 22:34:06 -0700 |
| commit | 51e8b7fae6ff14c58bf32ef740a60386bc15baee (patch) | |
| tree | ea6c3b90df1bf79f9891f0a6489fb0342256bc2c /indra/newview/llinventoryfunctions.cpp | |
| parent | 9e7caa2e1439eb75df30c0c03aab782c414b44bd (diff) | |
DD-129 : Prevent DAMA when dropping under the root of a listing, even active. Finer granularity of DAMA for all drop and cut and paste cases.
Diffstat (limited to 'indra/newview/llinventoryfunctions.cpp')
| -rwxr-xr-x | indra/newview/llinventoryfunctions.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 98f74bb1a6..8ea8e5998e 100755 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -1973,7 +1973,8 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root } // Note: we do not prompt for change when opening items (e.g. textures or note cards) on the marketplace... } - else if (LLMarketplaceData::instance().isInActiveFolder(viewModel->getUUID())) + else if (LLMarketplaceData::instance().isInActiveFolder(viewModel->getUUID()) || + LLMarketplaceData::instance().isListedAndActive(viewModel->getUUID())) { // If item is in active listing, further confirmation is required if ((("cut" == action) || ("delete" == action)) && (LLMarketplaceData::instance().isListed(viewModel->getUUID()) || LLMarketplaceData::instance().isVersionFolder(viewModel->getUUID()))) |