aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-251-3/+6
|\
| * One more pass at object inventory. This time, fix SceneObjectPartInventory so...Diva Canto2010-12-241-68/+68
* | Fix up some locking issues in task inventory. Don't use any prior versions in...Melanie2010-12-221-0/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-1/+1
|\ \ | |/
| * What is the point of using different types to express the same damn thing?Melanie2010-12-211-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-0/+1
|\ \ | |/
| * Another good catch. Update file name serial.Melanie2010-12-211-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-0/+1
|\ \ | |/
| * Added a missed return. Thanks diva!Melanie2010-12-211-0/+1
| * Fix up merge artifactsMelanie2010-12-211-10/+1
| * Make prim inventories a bit more saneMelanie2010-12-211-41/+33
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-19/+21
* | Restore CM loking after core extractMelanie2010-12-211-65/+64
* | Make prim inventories a bit more saneMelanie2010-12-211-43/+33
* | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-17/+20
* | Lock the iteration over the inventory items when saving script statesMelanie2010-09-281-0/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-271-47/+48
|\ \ | |/
| * Fix build breakMelanie2010-09-271-37/+38
| * if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-271-3/+11
* | if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-241-1/+8
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-4/+1
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-161-0/+27
| |\
| | * Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}Justin Clark-Casey (justincc)2010-09-171-22/+21
| | * JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-161-0/+28
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-161-4/+1
| |/
* | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-161-0/+28
* | Don't fart when deserializing a prim with no ParentGroup set yetmeta72010-09-151-1/+5
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-131-3/+3
|\ \ | |/
| * MergedJohn Hurliman2010-09-121-1/+1
| |\
| | * Formatting cleanup.Jeff Ames2010-09-121-1/+1
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-121-1/+1
| |/
| * Fixed the naming mess around data connectors for simulation dataJohn Hurliman2010-09-111-1/+1
| * If a scene object part UUID is changed (only possible when not in a scene), t...Justin Clark-Casey (justincc)2010-09-071-0/+3
| * Fix an issue with rezzing scripted objects.Melanie Thielker2010-09-031-2/+2
* | Fix an issue with rezzing scripted objects.Melanie Thielker2010-09-031-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-301-2/+1
|\ \ | |/
| * Remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-261-2/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-261-2/+67
|\ \ | |/
| * Improve consistency of locking for SOG.m_parts in order to avoid race conditi...Justin Clark-Casey (justincc)2010-08-261-1/+4
| * refactor: Push item retrieval and fixing part of Scene.RezObject() down into ...Justin Clark-Casey (justincc)2010-08-251-2/+64
* | Remove posting region restart event from SOP, as it's now in XMReMelanie Thielker2010-08-061-16/+0
* | Implement CHANGED_REGION_(RE)START and also fix various CHANGED_* constants w...Tom2010-08-061-0/+16
* | 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