aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Remove two causes of recursive locking. Merge artefact cleanup.Melanie2012-06-061-7/+5
* Merge branch 'master' into careminsterMelanie2012-05-271-10/+18
|\
| * refactor: replace LSL_Api.InventoryKey(string) largely with SceneObjectPartIn...Justin Clark-Casey (justincc)2012-05-261-8/+14
| * Remove a call stack debugging line accidentally left in from a few days ago a...Justin Clark-Casey (justincc)2012-05-251-2/+0
| * Fix bug where an avatar that had an object they owned attached through llAtta...Justin Clark-Casey (justincc)2012-05-231-0/+7
* | Merge branch 'master' into careminsterMelanie2012-05-051-2/+8
|\ \ | |/
| * Fire the scripting changed event with CHANGED_OWNER when an object that has c...Justin Clark-Casey (justincc)2012-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
|\ \ \ | | |/ | |/|
| * | Mantis 55025 Implement script time.Talun2012-04-121-7/+7
* | | Merge branch 'master' into careminsterMelanie2012-04-091-0/+50
|\ \ \ | |/ / | | / | |/ |/|
| * Mantis5502 implementation of some of the new constantsTalun2012-04-091-1/+50
* | Merge branch 'master' into careminsterMelanie2012-03-311-1/+1
|\ \ | |/
| * refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the...Justin Clark-Casey (justincc)2012-03-311-1/+1
* | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-221-3/+3
|\ \ | |/
| * Add llGiveInventory() test from object to object where both objects are owned...Justin Clark-Casey (justincc)2012-03-221-3/+3
* | Merge branch 'master' into careminsterMelanie2012-02-071-8/+6
|\ \ | |/
| * Add a regression test to compile and start a script. Remove Path.GetDirector...Justin Clark-Casey (justincc)2012-02-071-8/+4
| * Improve reliability of script state saving by covering various savingMelanie2012-02-021-10/+16
* | Improve reliability of script state saving by covering various savingMelanie2012-02-021-9/+15
* | Merge branch 'master' into bigmergeMelanie2011-11-281-2/+2
|\ \ | |/
| * Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conv...Justin Clark-Casey (justincc)2011-11-251-2/+2
* | Merge branch 'master' into bigmergeMelanie2011-11-241-5/+5
|\ \ | |/
| * Stop an exception being thrown and a teleport/border cross failing if the des...Justin Clark-Casey (justincc)2011-11-221-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
|\ \ | |/
| * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to refle...Justin Clark-Casey (justincc)2011-09-151-1/+1
| * Only bother to create an inventory xfer file if there are any items in a prim...Justin Clark-Casey (justincc)2011-09-151-2/+2
| * Shuffle order of code in invnetory connector GetFolderContent() calls to avoi...Justin Clark-Casey (justincc)2011-09-151-1/+1
* | Merge commit '42f1b88eb2492f8d218526c1b30ac027a65d67f3' into bigmergeMelanie2011-10-111-0/+11
|\ \ | |/
| * If a prim inventory becomes empty through deletion, send an empty xfer file n...Justin Clark-Casey (justincc)2011-09-151-20/+43
* | Bring us up to date.Tom2011-09-141-0/+5
|\ \ | |/
| * Stop attempts to rewear already worn items from removing and reattaching.Justin Clark-Casey (justincc)2011-09-131-0/+5
* | 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