diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-04-29 21:13:21 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-04-29 21:13:21 +0300 |
| commit | 0d793f4fa3b6687b51f0773296cb3dc06474c5ea (patch) | |
| tree | ea740e4088ccd9c0e6fb019f4e066aa9387bb059 /indra/newview | |
| parent | 3f31901640b11740da43b23f0d9902407ee9313d (diff) | |
restored SL-14027 (merge conflict)
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatereditenvironmentbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatereditenvironmentbase.cpp b/indra/newview/llfloatereditenvironmentbase.cpp index e888144b6a..2850951668 100644 --- a/indra/newview/llfloatereditenvironmentbase.cpp +++ b/indra/newview/llfloatereditenvironmentbase.cpp @@ -262,7 +262,7 @@ void LLFloaterEditEnvironmentBase::onSaveAsCommit(const LLSD& notification, cons { const LLUUID &marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false); LLUUID parent_id = mInventoryItem->getParentUUID(); - if (marketplacelistings_id == parent_id) + if (marketplacelistings_id == parent_id || gInventory.isObjectDescendentOf(mInventoryItem->getUUID(), gInventory.getLibraryRootFolderID())) { parent_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_SETTINGS); } |