diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 21:52:37 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2021-07-19 21:52:37 +0000 |
| commit | 08f04113c9252258c9cb6132efa327432c3c27e0 (patch) | |
| tree | 5ec6c6d42eaca354f58e21b926d9108e43367484 /indra/newview/llfloatereditenvironmentbase.cpp | |
| parent | 10f84d8244d01728338f1eb20b0b25271fc7db63 (diff) | |
| parent | aa322d8eb4341c213a19cef87a887114c1ca278b (diff) | |
Merged in DV541-merge-6.4.22 (pull request #629)
DRTVWR-541 merge up to v 6.4.22
Diffstat (limited to 'indra/newview/llfloatereditenvironmentbase.cpp')
| -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); } |