aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* seems to compile ( tests comented out)UbitUmarov2015-09-021-13/+0
* bad merge?UbitUmarov2015-09-011-289/+523
|\
| * return bbox and offsetHeight to RezObjectUbitUmarov2014-11-191-5/+4
| * compile fixUbitUmarov2014-09-211-3/+5
| * release lock a bit sooner when not needed, add a try on more complex dbUbitUmarov2014-09-211-4/+11
| * protect getting the itemUbitUmarov2014-09-211-1/+3
| * remove redundant codeUbitUmarov2014-09-211-20/+7
| * taskInventory request: give each transfer a diferent filename, Add moreUbitUmarov2014-09-121-101/+96
| * apply objectSlamSale to all roots of coalescence objects. replace theUbitUmarov2014-08-051-1/+1
| * dont mess with names and descriptions on coalescence objects. InventoryUbitUmarov2014-08-051-1/+3
| * revert to old avn-current code, not using ApplyPermissionsOnRez() till itsUbitUmarov2014-08-051-1/+43
| * replace old Attachoffset by AttachedPos. Comented out possible mergeUbitUmarov2014-07-201-3/+3
| * Merge branch 'master' into careminsterMelanie2014-01-281-38/+17
| |\
| * \ Merge branch 'master' into careminsterMelanie2013-11-031-49/+58
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-07-181-1/+2
| |\ \ \
| * | | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+1
| * | | | Merge branch 'master' into careminsterMelanie2012-10-311-14/+35
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-181-0/+9
| |\ \ \ \ \
| * | | | | | 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
generated by cgit v1.1 at 2024-07-07 18:14:34 +0000