diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-10-19 14:16:57 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-10-19 14:16:57 -0500 |
| commit | 0682e10532e058462d2bb1d5379c55d0e4d757e9 (patch) | |
| tree | bb4903c3ea087c7d2dd00eed666024302927cb0c /indra/newview/llmeshrepository.cpp | |
| parent | 256c6e6a252feaa7ae50f81778aab1e0246a526a (diff) | |
| parent | 9db8e12f3381cdf928b422e7c6e9b400cb155d52 (diff) | |
merge
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 5e95376830..72019d8de8 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -2954,13 +2954,12 @@ LLSD LLMeshUploadThread::createObject(LLModelInstance& instance) perm.setOwnerAndGroup(gAgent.getID(), gAgent.getID(), LLUUID::null, false); perm.setCreator(gAgent.getID()); - perm.initMasks(PERM_ITEM_UNRESTRICTED, //base - PERM_ITEM_UNRESTRICTED, //owner + perm.initMasks(PERM_ITEM_UNRESTRICTED | PERM_MOVE, //base + PERM_ITEM_UNRESTRICTED | PERM_MOVE, //owner LLFloaterPerms::getEveryonePerms(), LLFloaterPerms::getGroupPerms(), - LLFloaterPerms::getNextOwnerPerms()); - - + LLFloaterPerms::getNextOwnerPerms()); + object_params["permissions"] = ll_create_sd_from_permissions(perm); object_params["physics_shape_type"] = (U8)(LLViewerObject::PHYSICS_SHAPE_CONVEX_HULL); |