summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2020-10-01 18:07:55 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2020-10-01 18:07:55 +0300
commitf9d90dbf3dffb56fdcfe979ed1921ae3add04d45 (patch)
tree868e8f9575a4ac576fe3a006554788c890fc9349 /indra/newview
parent0b395f01f9cfc71bdc6692c4392ffe3da50963ee (diff)
SL-14027 Save asset to Settings folder instead of Library
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterfixedenvironment.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index 37e162b249..5ce217fb33 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -496,7 +496,8 @@ void LLFloaterFixedEnvironment::onSaveAsCommit(const LLSD& notification, const L
{
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);
}