aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* replace old Attachoffset by AttachedPos. Comented out possible mergeUbitUmarov2014-07-201-5/+6
* fix attachmentsUbitUmarov2014-07-191-7/+9
* Merge branch 'master' into careminsterMelanie2014-01-281-7/+10
|\
| * Refactored: use a single function to apply an object's folded permissions to ...Oren Hurvitz2014-01-101-7/+10
* | Merge branch 'master' into careminsterMelanie2013-11-031-22/+113
|\ \ | |/
| * Fixed rezzing coalesced objects from a prim's inventoryOren Hurvitz2013-10-151-22/+97
* | Merge branch 'master' into careminsterMelanie2013-10-041-0/+10
|\ \ | |/
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-221-0/+7
| * Reinsert comments about possible race conditions when sending bulk inventory ...Justin Clark-Casey (justincc)2013-09-161-0/+3
* | Merge branch 'master' into careminsterMelanie2013-08-181-4/+16
|\ \ | |/
| * Allow updating the wearable type of wearables that have a type of 0.Melanie2013-08-181-4/+16
* | Merge branch 'master' into careminsterMelanie2013-08-071-0/+6
|\ \ | |/
| * More on HG inventory and OutboundPermission: disallowing giving inventory to ...Diva Canto2013-08-031-0/+3
| * HG: If OutboundPermission is set to false, let's enforce stricter permissions...Diva Canto2013-08-031-0/+3
* | Merge branch 'master' into careminsterMelanie2013-07-241-2/+2
|\ \ | |/
| * Don't post Link asset types back to the home gridDiva Canto2013-07-231-2/+2
| * Fix other places when saving scripts or notecards in prim inventories where m...Justin Clark-Casey (justincc)2013-06-181-5/+5
* | Merge branch 'master' into careminsterMelanie2013-05-161-3/+3
|\ \ | |/
| * Comment out some debugging item permission messages since these are highly no...Justin Clark-Casey (justincc)2013-05-141-3/+3
* | Merge branch 'master' into careminsterMelanie2013-05-111-1/+4
|\ \ | |/
| * Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset().Justin Clark-Casey (justincc)2013-05-091-1/+4
| * Export permission, part two. Setting export perms for textures and clothing w...Melanie2013-03-311-3/+43
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-3/+4
* | Export permission, part two. Setting export perms for textures and clothing w...Melanie2013-03-311-3/+43
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-3/+4
* | Merge branch 'master' into careminsterMelanie2013-01-271-6/+7
|\ \ | |/
| * Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-271-5/+6
| * Implement co-operative script termination if termination comes during a scrip...Justin Clark-Casey (justincc)2013-01-161-3/+23
| * Revert "Implement co-operative script termination if termination comes during...Justin Clark-Casey (justincc)2013-01-161-23/+3
| * Implement co-operative script termination if termination comes during a scrip...Justin Clark-Casey (justincc)2013-01-161-3/+23
* | JustinCC's core re-mergeMelanie2013-01-161-3/+23
* | Merge branch 'master' into careminsterMelanie2012-12-161-6/+4
|\ \ | |/
| * Switched the order by which foreign inventory and foreign assets are brought ...Diva Canto2012-12-091-6/+4
| * UserManagementModule: search the local cache for names too.Diva Canto2012-12-091-1/+1
* | Merge branch 'master' into careminsterMelanie2012-11-111-2/+13
|\ \ | |/
| * Uncomment SceneObjectBasicTests.TestDeleteSceneObjectAsyncToUserInventory() a...Justin Clark-Casey (justincc)2012-11-101-2/+13
* | Merge branch 'avination' into careminsterMelanie2012-10-301-1/+1
|\ \
| * | Set the script state to new rez when a scriptis saved, rather than region start.Melanie2012-10-281-1/+1
* | | Merge branch 'avination' into careminsterMelanie2012-10-171-0/+6
|\ \ \ | |/ /
| * | Fix perms when linking an object. Set root part perms to the permsMelanie2012-10-141-0/+6
* | | Merge branch 'master' into careminsterMelanie2012-10-071-1/+1
|\ \ \ | | |/ | |/|
| * | On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-061-1/+1
* | | Merge branch 'avination' into careminsterMelanie2012-09-271-4/+15
|\ \ \ | | |/ | |/|
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-4/+15
* | | Merge branch 'avination' into careminsterMelanie2012-09-161-2/+2
|\ \ \ | |/ /
| * | Add the option to have variable costing for uploadsMelanie2012-09-111-2/+2
* | | Merge commit 'a0d178b284050df64d0eb5b9728565fd72615c22' into careminsterMelanie2012-08-251-1/+1
|\ \ \ | | |/ | |/|
| * | Log initial script startup info notice when xengine actually starts to do thi...Justin Clark-Casey (justincc)2012-08-251-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-08-241-0/+3
|\ \ \ | |/ / | | / | |/ |/|
| * Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-241-0/+3