aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-031-49/+58
|\
| * Fixed rezzing coalesced objects from a prim's inventoryOren Hurvitz2013-10-151-46/+55
* | Merge branch 'master' into careminsterMelanie2013-07-181-1/+2
|\ \ | |/
| * Put guards on a bunch of exception-inducing code, as seen in logs from load t...Diva Canto2013-07-091-1/+2
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+1
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+1
* | Merge branch 'master' into careminsterMelanie2012-10-311-14/+35
|\ \ | |/
| * Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-311-17/+35
* | Merge branch 'master' into careminsterMelanie2012-10-181-0/+9
|\ \ | |/
| * Add number of inventory items to information displayed via "show part" consol...Justin Clark-Casey (justincc)2012-10-181-0/+9
* | Fix merge artefactsMelanie2012-07-171-7/+2
* | Merge branch 'master' into careminsterMelanie2012-07-121-0/+4
|\ \ | |/
| * Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-111-0/+4
* | Merge branch 'master' into careminsterMelanie2012-07-111-3/+56
|\ \ | |/
| * When an attachment is detached to inv or derezzed, stop the scripts, update t...Justin Clark-Casey (justincc)2012-07-101-3/+56
* | Merge branch 'master' into careminsterMelanie2012-07-051-1/+1
|\ \ | |/
| * Fix issue in database tests where sogs being stored are not in a scene.Justin Clark-Casey (justincc)2012-07-031-1/+1
| * Add preservation of running state of scripts when drag-copying.Melanie2012-07-011-1/+35
* | Merge branch 'master' into careminsterMelanie2012-06-211-50/+62
|\ \ | |/
| * Log how many scripts are candidates for starting and how many are actually st...Justin Clark-Casey (justincc)2012-06-201-52/+58
* | 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