aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Resolve merge commits, stage 1Tom2011-09-041-4/+7
|\
| * Remove pointless cluttering SOP.ParentGroup != null checks.Justin Clark-Casey (justincc)2011-09-011-4/+6
| * refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid poin...Justin Clark-Casey (justincc)2011-08-271-1/+1
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2011-04-301-0/+3
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-0/+3
| |\ \ | | |/
| | * Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.Justin Clark-Casey (justincc)2011-04-281-2/+5
| | * A stab at making CHANGED_OWNER workMelanie2011-04-011-5/+5
* | | Set the attachment data on scripted rez to allow toasters to work.Melanie2011-04-301-0/+3
|/ /
* | A stab at making CHANGED_OWNER workMelanie2011-04-011-5/+5
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-141-2/+6
|\ \ | |/
| * For objects loaded from an IAR, make sure the CreatorID points towards the OS...Justin Clark-Casey (justincc)2011-03-101-2/+6
| * Fix script data not being reset as it should beMelanie2011-01-241-0/+4
| * minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2011-01-181-1/+1
| * Fix slam bits being lost when editing perms in prim inventoryMelanie2011-01-141-1/+0
| * Fix direct item give permissionsMelanie2011-01-121-6/+16
| * Partial permissions fix for boxed items.Melanie2011-01-121-0/+7
| * Fix god mode perms adjustmentMelanie2011-01-121-0/+2
* | Fix script data not being reset as it should beMelanie2011-01-241-0/+4
* | Fix slam bits being lost when editing perms in prim inventoryMelanie2011-01-141-1/+0
* | Fix direct item give permissionsMelanie2011-01-121-6/+16
* | Partial permissions fix for boxed items.Melanie2011-01-101-10/+8
* | Preserve the script running flag when copying an object.Melanie2011-01-081-0/+34
* | Fix a couple of security issuesMelanie2011-01-081-3/+9
* | Fix god mode perms adjustmentMelanie2011-01-061-0/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-251-3/+6
|\ \ | |/
| * One more pass at object inventory. This time, fix SceneObjectPartInventory so...Diva Canto2010-12-241-68/+68
* | Fix up some locking issues in task inventory. Don't use any prior versions in...Melanie2010-12-221-0/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-1/+1
|\ \ | |/
| * What is the point of using different types to express the same damn thing?Melanie2010-12-211-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-0/+1
|\ \ | |/
| * Another good catch. Update file name serial.Melanie2010-12-211-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-0/+1
|\ \ | |/
| * Added a missed return. Thanks diva!Melanie2010-12-211-0/+1
| * Fix up merge artifactsMelanie2010-12-211-10/+1
| * Make prim inventories a bit more saneMelanie2010-12-211-41/+33
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-19/+21
* | Restore CM loking after core extractMelanie2010-12-211-65/+64
* | Make prim inventories a bit more saneMelanie2010-12-211-43/+33
* | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-17/+20
* | Lock the iteration over the inventory items when saving script statesMelanie2010-09-281-0/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-271-47/+48
|\ \ | |/
| * Fix build breakMelanie2010-09-271-37/+38
| * if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-271-3/+11
* | if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-241-1/+8
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-4/+1
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-161-0/+27
| |\
| | * Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}Justin Clark-Casey (justincc)2010-09-171-22/+21
| | * JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-161-0/+28
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-161-4/+1
| |/
* | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-161-0/+28