diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-20 02:48:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-20 02:48:05 +0300 |
| commit | 6c8e6f033b6c94c9f8d6ceb5b0375665a50a69af (patch) | |
| tree | 323137947b5e318f88f9f87ad981c79af966680e /indra/newview/llfloatereditenvironmentbase.cpp | |
| parent | a6ea2dbedcf54b6a847d894b77777cc88698a28d (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' into DRTVWR-521-maint
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
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); } |