aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | Prevents stealing IDs of animations, sounds and textures from prim inventories. Prevents copybot from gathering the wearable UUIDs needed for pirating things from vendors.
* | if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-241-1/+8
| | | | | | | | | | | | Prevents stealing IDs of animations, sounds and textures from prim inventories. Prevents copybot from gathering the wearable UUIDs needed for pirating things from vendors.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-4/+1
|\ \ | |/ | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it.
| * 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 ↵John Hurliman2010-09-161-4/+1
| |/ | | | | | | MapAndArray collection
* | 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
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * MergedJohn Hurliman2010-09-121-1/+1
| |\
| | * Formatting cleanup.Jeff Ames2010-09-121-1/+1
| | |
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-121-1/+1
| |/ | | | | | | | | * Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
| * 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), ↵Justin Clark-Casey (justincc)2010-09-071-0/+3
| | | | | | | | then adjust the inventory items to point to the new uuid as well
| * 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
|\ \ | |/ | | | | This was rather conflicted. Please test linking.
| * Improve consistency of locking for SOG.m_parts in order to avoid race ↵Justin Clark-Casey (justincc)2010-08-261-1/+4
| | | | | | | | conditions in linking and unlinking
| * refactor: Push item retrieval and fixing part of Scene.RezObject() down into ↵Justin Clark-Casey (justincc)2010-08-251-2/+64
| | | | | | | | SceneObjectPartInventory
* | 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 ↵Tom2010-08-061-0/+16
| | | | | | | | which had the wrong values (checked using LSL in SL). This addresses mantis #217 and mantis #53.
* | 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
| | | | | | | | escalation on items contained in prims using a hacked viewer
| * Relaxed the ultra-conservative lock on m_items. Needs testing under linux ↵Diva Canto2010-07-201-219/+188
| | | | | | | | and stress.
| * Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests ↵Diva Canto2010-07-191-1/+0
| | | | | | | | indicate that this is what causes deadlock. More tests needed.
| * 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
| | | | | | | | This reverts commit c404c5fb5405eac24cc8b7cd402eb8d8fb0ff0cf.
| * Revamp the permissions propagation. This MAY mess up. Please test.Melanie2010-07-131-1/+0
| | | | | | | | | | | | | | Change the slam bit from 3 to 4. Assume the old slam bit is always set. The new slam bit is a "changed owner" bit, correcting a bug where an item passed from the creator to another with less than full perms, then back (sale test) would arrive back full perm. Lots of in-code docs.
| * Revert "stop exceptions in setting and getting state from propogating since ↵Justin Clark-Casey (justincc)2010-06-291-31/+8
| | | | | | | | | | | | they aren't fatal to operations" This reverts commit 94cb6fc916e1bd039f2b59214e68a0b3c4847445.
| * stop exceptions in setting and getting state from propogating since they ↵Justin Clark-Casey (justincc)2010-06-291-8/+31
| | | | | | | | | | | | aren't fatal to operations this will hopefully stop "save oar" from failing if a script asset is corrupt
* | Fix a few permissions vulnerability. Owners could cause permissionsMelanie Thielker2010-07-151-6/+0
| | | | | | | | escalation on items contained in prims using a hacked viewer
* | Revamp the permissions propagation. This MAY mess up. Please test.Melanie Thielker2010-07-131-1/+0
| | | | | | | | | | | | | | Change the slam bit from 3 to 4. Assume the old slam bit is always set. The new slam bit is a "changed owner" bit, correcting a bug where an item passed from the creator to another with less than full perms, then back (sale test) would arrive back full perm. Lots of in-code docs.
* | 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
| |