aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Resync with masterMelanie2010-07-201-7/+1
* Merge branch 'master' into careminster-presence-refactorMelanie2010-07-201-1/+5
|\
| * Restore lines that have been removed due to previous merge conflict.Diva Canto2010-07-201-2/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-201-4/+0
|\ \ | |/
| * Remove a merge artefactMelanie2010-07-201-4/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-201-11/+29
|\ \ | |/
| * Fix a few permissions vulnerability. Owners could cause permissionsMelanie Thielker2010-07-201-5/+5
| * Relaxed the ultra-conservative lock on m_items. Needs testing under linux and...Diva Canto2010-07-201-219/+188
| * Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests ...Diva Canto2010-07-191-1/+0
| * re-add the sleep lost in the revert.Melanie2010-07-191-0/+2
| * Revert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage"Melanie2010-07-191-12/+10
| * Revamp the permissions propagation. This MAY mess up. Please test.Melanie2010-07-131-1/+0
| * Revert "stop exceptions in setting and getting state from propogating since t...Justin Clark-Casey (justincc)2010-06-291-31/+8
| * stop exceptions in setting and getting state from propogating since they aren...Justin Clark-Casey (justincc)2010-06-291-8/+31
* | Fix a few permissions vulnerability. Owners could cause permissionsMelanie Thielker2010-07-151-6/+0
* | Revamp the permissions propagation. This MAY mess up. Please test.Melanie Thielker2010-07-131-1/+0
* | And another conflictMelanie2010-06-241-17/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-241-1/+20
|\ \ | |/
| * Thank you, Snoopy, for a patch to reduce sim script startup CPU usageMelanie2010-06-231-10/+12
| * Don't filre CHANGED_INVENTORY if a prim comes in from storageMelanie2010-06-121-1/+1
| * Fix a bug in owner change notificationMelanie2010-05-031-1/+3
* | Don't filre CHANGED_INVENTORY if a prim comes in from storageMelanie2010-06-121-1/+1
* | Fix another ReaderWriterLockSlim issueTom Grimshaw2010-05-101-1/+1
* | Fix a bug in owner change notificationMelanie Thielker2010-05-031-1/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-031-2/+4
|\ \ | |/
| * Defer sending of CHANGED_OWNER to make it work on rezzed objects andMelanie2010-05-031-3/+4
| * Fix build break.Melanie2010-04-271-17/+17
| * Add a parameter to prim inventory update to prevent event firingMelanie2010-04-271-18/+25
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-191-29/+48
| |\
| * | Make the "notecard saved" text appear in the saver rather than the notecard o...Justin Clark-Casey (justincc)2010-04-191-10/+0
* | | Add a parameter to prim inventory update to prevent event firingMelanie Thielker2010-04-271-1/+7
* | | Make scripted attachment states work. Finally. Also replace two monitor locksMelanie Thielker2010-04-251-13/+28
* | | Remove debug output, the culprit has been identifiedMelanie Thielker2010-04-231-6/+0
* | | Fix a nullref in attachment handling. Add some debug to find the attachmentMelanie Thielker2010-04-231-0/+6
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-191-32/+29
|\ \ \ | | |/ | |/|
| * | Make script asset fetches synchronous. Script instantiation synchronizationMelanie2010-04-191-28/+24
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-191-2/+34
|\ \ \ | |/ /
| * | All scripts are now created suspended and are only unsuspended when the objectMelanie2010-04-191-1/+24
| |/
| * Partially implement share with group option for object inventory itemsJustin Clark-Casey (justincc)2010-04-051-1/+9
* | Merge branch 'master' into careminster-presence-refactorMelanie Thielker2010-04-191-6/+65
|\ \
| * | This GetScriptErrors() change allows initial XEngine to run in backgroundMike Rieker2010-04-181-6/+65
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-131-8/+68
|\ \ \ | |/ /
| * | guarantee that a script engine's GetScriptErrors() will not be calledMike Rieker2010-04-101-8/+68
| * | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-061-4/+2
| |\ \
* | \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-03-061-1/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules...Justin Clark-Casey (justincc)2010-03-041-1/+0
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-031-5/+2
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge branch 'master' into presence-refactorMelanie2010-02-221-3/+3
| |\ \ | | |/
| | * Formatting cleanup.Jeff Ames2010-02-151-3/+3
| * | Merge branch 'master' into presence-refactorMelanie2010-02-081-92/+173
| |\ \ | | |/