Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Refactor script create permission into the perms module | Melanie | 2010-09-21 | 1 | -10/+0 |
| | |||||
* | Fix a merge artefact that broke script state persistence in XAttachments | Melanie | 2010-09-19 | 1 | -1/+1 |
| | |||||
* | Remove the now unused partslock | root | 2010-09-17 | 1 | -1/+0 |
| | |||||
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 12 | -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 Hurliman | 2010-09-16 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-16 | 3 | -1/+38 |
| |\ | |||||
| | * | Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {} | Justin Clark-Casey (justincc) | 2010-09-17 | 1 | -22/+21 |
| | | | |||||
| | * | Removing debug | root | 2010-09-16 | 1 | -1/+0 |
| | | | |||||
| | * | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it. | root | 2010-09-16 | 4 | -1/+40 |
| | | | |||||
| * | | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 12 | -943/+682 |
| |/ | | | | | | | MapAndArray collection | ||||
* | | Removing debug | root | 2010-09-16 | 1 | -1/+0 |
| | | |||||
* | | JustinCC is evil. f7b28dd3 broke script persistence. This fixes it. | root | 2010-09-16 | 4 | -1/+40 |
| | | |||||
* | | Some small bug fixes | root | 2010-09-16 | 2 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-16 | 3 | -13/+10 |
|\ \ | |/ | |||||
| * | rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve ↵ | Justin Clark-Casey (justincc) | 2010-09-15 | 3 | -3/+3 |
| | | | | | | | | code readability | ||||
| * | Instead of locking SOG.Children when a group is being removed from the ↵ | Justin Clark-Casey (justincc) | 2010-09-15 | 1 | -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 yet | meta7 | 2010-09-15 | 1 | -1/+5 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-09-14 | 5 | -33/+18 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | reorder some code to avoid merge issues in the future | Melanie | 2010-09-14 | 1 | -5/+5 |
| | | | |||||
| * | | Fix merge issues | Melanie | 2010-09-14 | 2 | -5/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 5 | -26/+14 |
| |\ \ | | |/ | |||||
| | * | Comment out SOG storing debug log message | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -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-13 | 2 | -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-13 | 1 | -10/+0 |
| | | | | | | | | | | | | being migrated to AttachmentsModule | ||||
| | * | Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -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 attached | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -9/+3 |
| | | | |||||
* | | | Adjust the code for ghost prim removal to new information from Kitto | Melanie Thielker | 2010-09-14 | 1 | -3/+7 |
|/ / | |||||
* | | Fix a small left over buglet and also add checking of the physics actor | Melanie Thielker | 2010-09-14 | 1 | -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-refactor | Melanie | 2010-09-13 | 29 | -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. | ||||
| * | Merged | John Hurliman | 2010-09-12 | 21 | -86/+113 |
| |\ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 21 | -88/+88 |
| | | | |||||
| | * | Add copyright headers. | Jeff Ames | 2010-09-12 | 1 | -0/+27 |
| | | | |||||
| * | | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 8 | -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 Hurliman | 2010-09-12 | 2 | -20/+102 |
| | | | | | | | | OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector | ||||
| * | Shuffling fields and properties around in Scene to make Scene.cs more readable | John Hurliman | 2010-09-11 | 1 | -138/+124 |
| | | |||||
| * | Changed all string references of "IRegionDataStore" to "ISimulationDataStore" | John Hurliman | 2010-09-11 | 1 | -2/+2 |
| | | |||||
| * | Fixed the naming mess around data connectors for simulation data | John Hurliman | 2010-09-11 | 6 | -11/+11 |
| | | |||||
| * | Made it impossible to create a user with names containing spaces and ↵ | randomhuman | 2010-09-10 | 1 | -2/+3 |
| | | | | | | | | prevented passwords from being echoed after enter is pressed. | ||||
| * | Second pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 3 | -58/+35 |
| | | |||||
| * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 8 | -346/+221 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-08 | 3 | -3/+10 |
| |\ | |||||
| | * | * Cache null account responses in the SimianUserAccountServiceConnector to ↵ | John Hurliman | 2010-09-07 | 1 | -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-07 | 2 | -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 an | Melanie Thielker | 2010-09-08 | 1 | -1/+4 |
| | | | | | | | | | | | | object out of the scene and then put it back in. | ||||
* | | | Fix some issues with unlinking | Melanie Thielker | 2010-09-07 | 1 | -56/+53 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 1 | -0/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Make sure unlinked child prims get persisted | Melanie | 2010-09-07 | 1 | -0/+5 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 11 | -58/+163 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-07 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | minor: comment out some excessive test logging | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -1/+1 |
| | | |