diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-09-15 17:23:55 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-09-15 17:23:55 -0500 |
| commit | 5a3631659fb4fe8c2b70c90c490a6c7e486289e9 (patch) | |
| tree | ba58c508de6f80636e0a01fd9e837c7bb8bf68e0 /indra/newview/llmaterialeditor.cpp | |
| parent | 82ab5f9765ad76c73d1d7ddd5716b22d6b92bf62 (diff) | |
| parent | c5dd5a0e49d08d106d28d872ce681430820585a7 (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 477f834a22..b4e5e14885 100644 --- a/indra/newview/llmaterialeditor.cpp +++ b/indra/newview/llmaterialeditor.cpp @@ -761,7 +761,7 @@ bool LLMaterialEditor::saveIfNeeded() tid.generate(); // timestamp-based randomization + uniquification LLAssetID new_asset_id = tid.makeAssetID(gAgent.getSecureSessionID()); std::string res_desc = buildMaterialDescription(); - U32 next_owner_perm = LLPermissions::DEFAULT.getMaskNextOwner(); + U32 next_owner_perm = LLFloaterPerms::getNextOwnerPerms("Uploads"); LLUUID parent = gInventory.findUserDefinedCategoryUUIDForType(LLFolderType::FT_MATERIAL); const U8 subtype = NO_INV_SUBTYPE; // TODO maybe use AT_SETTINGS and LLSettingsType::ST_MATERIAL ? |