aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ | | |/
| | * minor: remove a couple of mono warningsJustin Clark-Casey (justincc)2010-02-031-2/+0
| * | OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.Diva Canto2010-01-111-1/+0
* | | Merge branch 'master' into careminsterMelanie2010-02-021-1/+25
|\ \ \
| * | | Revert "improve locking of m_items in SceneObjectPartInventory"Melanie2010-02-021-133/+85
| | |/ | |/|
| * | improve locking of m_items in SceneObjectPartInventoryJustin Clark-Casey (justincc)2010-01-291-85/+133
| * | Add method to get all items with the same name from a particular primJustin Clark-Casey (justincc)2010-01-291-1/+25
* | | Some merge fixupsMelanie2010-01-261-1/+1
* | | Merge branch 'master' into careminsterMelanie2010-01-261-3/+14
|\ \ \ | |/ /
| * | Fix a problem where llDie() calls were sometimes leaving dead objects behind.Justin Clark-Casey (justincc)2010-01-251-5/+16
| |/
| * Add a data path for error messagesroot2009-12-221-0/+22
* | Add a data path for error messagesroot2009-12-221-0/+22
* | Merge branch 'master' into careminsterMelanie2009-12-211-0/+1
|\ \ | |/
| * When a script has been loaded, remove it's state entry, so recompilingMelanie2009-12-211-0/+1
* | Merge branch 'master' into careminsterMelanie2009-12-211-7/+48
|\ \ | |/
| * Script State Fix: Part 2Melanie2009-12-211-7/+48
* | Fix to existing ReaderWriterLockSlim implementationsCasperW2009-12-061-1/+2