aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Fix merge artefactsMelanie2012-07-171-7/+2
| * | | | | | Merge branch 'master' into careminsterMelanie2012-07-121-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-111-3/+56
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-051-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-06-211-50/+62
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove two causes of recursive locking. Merge artefact cleanup.Melanie2012-06-061-7/+5
| * | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-05-271-10/+18
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-051-2/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination'Melanie2012-05-021-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Preserve attachment rotation on objects rezzed via a script. Makes toastersMelanie2012-05-021-0/+1
| * | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-04-131-68/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-04-091-0/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-221-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-071-8/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Improve reliability of script state saving by covering various savingMelanie2012-02-021-9/+15
| * | | | | | | | | | | | | | | | | Merge branch 'master' into bigmergeMelanie2011-11-281-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into bigmergeMelanie2011-11-241-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Remove backup optimization that was causing prim contents to poofMelanie2011-11-051-3/+8
| * | | | | | | | | | | | | | | | | | | Fix a missing locking callMelanie2011-10-251-0/+1
| * | | | | | | | | | | | | | | | | | | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-111-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmergeMelanie2011-10-111-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Bring us up to date.Tom2011-09-141-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Resolve merge commits, stage 1Tom2011-09-041-4/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-161-0/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't fart when deserializing a prim with no ParentGroup set yetmeta72010-09-151-1/+5