diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-10-19 14:16:24 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-10-19 14:16:24 -0500 |
| commit | 9db8e12f3381cdf928b422e7c6e9b400cb155d52 (patch) | |
| tree | 53ff27e78e8f9e777fda46e6c46f58112a0a707c /indra/newview/llmeshrepository.cpp | |
| parent | 8d8860d5b2b15c72655ddd2b3f99ccb809171425 (diff) | |
CTS-283 Fix for objects being locked when imported.
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 28db665ff9..08740a4e12 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -2937,13 +2937,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); |