diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-14 17:04:47 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-14 17:04:47 -0500 |
| commit | afb7efbfcc39f93bb018de6e0b4e5f0839a68ef5 (patch) | |
| tree | 476dd03a9af8a753ef9f89803e340d18cbc2a883 /indra/newview/llmaterialeditor.cpp | |
| parent | a0a87db3d76bc78e245e89254db190ba68b3709e (diff) | |
| parent | 5d918f98eaacc0eec84edcf23a40d6f6c93807c3 (diff) | |
Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp index 6461aa71a6..477f834a22 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -762,7 +762,7 @@ bool LLMaterialEditor::saveIfNeeded() LLAssetID new_asset_id = tid.makeAssetID(gAgent.getSecureSessionID()); std::string res_desc = buildMaterialDescription(); U32 next_owner_perm = LLPermissions::DEFAULT.getMaskNextOwner(); - LLUUID parent = gInventory.findCategoryUUIDForType(LLFolderType::FT_MATERIAL); + LLUUID parent = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_MATERIAL); const U8 subtype = NO_INV_SUBTYPE; // TODO maybe use AT_SETTINGS and LLSettingsType::ST_MATERIAL ? create_inventory_item(gAgent.getID(), gAgent.getSessionID(), parent, tid, mMaterialName, res_desc, |