aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Melanie2010-09-211-1/+1
|\ | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Refactor script create permission into the perms moduleMelanie2010-09-211-10/+0
| |
| * Fix a merge artefact that broke script state persistence in XAttachmentsMelanie2010-09-191-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-213-12/+41
|\ \ | |/ |/|
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-212-2/+41
| |\
| | * If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ↵Justin Clark-Casey (justincc)2010-09-212-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | scene, remove the old uuid reference from m_parts as well as adding the new one. The separate remove and set operations is SOG.set_UUID() are both locked under m_parts.SyncRoot since they are logically atomic (though this isn't such an issue if the SOG isn't part of a scene) Added unit test for this behaviour. Also changed the second m_parts.AddOrReplace() to m_parts.Add(). As the old reference is now removed we never end up replacing an identical uuid. And if we replace a uuid that's already there (from a child part) then this is an error.
| * | Refactor script create permission into the perms moduleMelanie2010-09-211-10/+0
| |/
* | Remove the now unused partslockroot2010-09-171-1/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1712-1027/+653
|\ \ | |/ | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it.
| * Fixed a regression in SOG.Copy()John Hurliman2010-09-161-1/+1
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-163-1/+38
| |\
| | * Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}Justin Clark-Casey (justincc)2010-09-171-22/+21
| | |
| | * Removing debugroot2010-09-161-1/+0
| | |
| | * JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-164-1/+40
| | |
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵John Hurliman2010-09-1612-943/+682
| |/ | | | | | | MapAndArray collection
* | Removing debugroot2010-09-161-1/+0
| |
* | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.root2010-09-164-1/+40
| |
* | Some small bug fixesroot2010-09-162-1/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-163-13/+10
|\ \ | |/
| * rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve ↵Justin Clark-Casey (justincc)2010-09-153-3/+3
| | | | | | | | code readability
| * Instead of locking SOG.Children when a group is being removed from the ↵Justin Clark-Casey (justincc)2010-09-151-15/+17
| | | | | | | | | | | | | | | | scene, iterate over an unlocked list instead Previously, deadlock was possible because deleting a group took a SOG.Children lock then an m_entityUpdates.SyncRoot lock in LLClientView At the same time, a thread starting from LLClientView.ProcessEntityUpdates() could take an m_entityUpdates.SyncRoot lock then later attempt to take a SOG.Children lock in PermissionsModule.GenerateClientFlags() and later on Taking a children list in SOG appears to be a better solution than changing PermissionsModule to not relook up the prim. Going the permission modules root would require that all downstream modules not take a SOG.Children lock either
* | Don't fart when deserializing a prim with no ParentGroup set yetmeta72010-09-151-1/+5
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-09-145-33/+18
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | reorder some code to avoid merge issues in the futureMelanie2010-09-141-5/+5
| | |
| * | Fix merge issuesMelanie2010-09-142-5/+2
| | |
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-145-26/+14
| |\ \ | | |/
| | * Comment out SOG storing debug log messageJustin Clark-Casey (justincc)2010-09-141-3/+3
| | | | | | | | | | | | This can get very spammy with regularly changing objects. Please uncomment if required.
| | * minor: Add comments which explain what's going on wrt avatar movements at ↵Justin Clark-Casey (justincc)2010-09-132-0/+6
| | | | | | | | | | | | various points in the main scene loop and associated methods
| | * Remove SceneGraph.DetachObject() which was accidentally left around after ↵Justin Clark-Casey (justincc)2010-09-131-10/+0
| | | | | | | | | | | | being migrated to AttachmentsModule
| | * Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interfaceJustin Clark-Casey (justincc)2010-09-131-11/+0
| | | | | | | | | | | | No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
| | * minor: Clean up log messages generated when an item is attachedJustin Clark-Casey (justincc)2010-09-131-9/+3
| | |
* | | Adjust the code for ghost prim removal to new information from KittoMelanie Thielker2010-09-141-3/+7
|/ /
* | Fix a small left over buglet and also add checking of the physics actorMelanie Thielker2010-09-141-0/+10
| | | | | | | | | | position on backup. This way, ant object that has been moved will be checked for ghost prims as soon as it is persisted.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1329-804/+702
|\ \ | |/ | | | | | | 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-1221-86/+113
| |\
| | * Formatting cleanup.Jeff Ames2010-09-1221-88/+88
| | |
| | * Add copyright headers.Jeff Ames2010-09-121-0/+27
| | |
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-128-118/+123
| |/ | | | | | | | | * 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
| * Added a stub for ↵John Hurliman2010-09-122-20/+102
| | | | | | | | OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector
| * Shuffling fields and properties around in Scene to make Scene.cs more readableJohn Hurliman2010-09-111-138/+124
| |
| * Changed all string references of "IRegionDataStore" to "ISimulationDataStore"John Hurliman2010-09-111-2/+2
| |
| * Fixed the naming mess around data connectors for simulation dataJohn Hurliman2010-09-116-11/+11
| |
| * Made it impossible to create a user with names containing spaces and ↵randomhuman2010-09-101-2/+3
| | | | | | | | prevented passwords from being echoed after enter is pressed.
| * Second pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-103-58/+35
| |
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-108-346/+221
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-083-3/+10
| |\
| | * * Cache null account responses in the SimianUserAccountServiceConnector to ↵John Hurliman2010-09-071-1/+3
| | | | | | | | | | | | | | | | | | avoid repeated requests for missing avatar IDs * Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
| * | If a scene object part UUID is changed (only possible when not in a scene), ↵Justin Clark-Casey (justincc)2010-09-072-2/+11
| | | | | | | | | | | | then adjust the inventory items to point to the new uuid as well
* | | Make AddRestoredSceneObject reset the IsDeleted flag so we can take anMelanie Thielker2010-09-081-1/+4
| | | | | | | | | | | | object out of the scene and then put it back in.
* | | Fix some issues with unlinkingMelanie Thielker2010-09-071-56/+53
| | |
generated by cgit v1.1 at 2024-12-24 18:48:08 +0000