Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |||||
* | Revert "Move OpenSimDefaults,ini into config-include in order to put it with ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -1/+1 | |
| | | | | | | | | all the other default files" This reverts commit c3259e9c26f198b5fe0e7ed6c29c17c27c60ecb1. Reverted by agreement. | |||||
* | Move OpenSimDefaults,ini into config-include in order to put it with all the ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -1/+1 | |
| | | | | other default files | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-13 | 9 | -52/+45 | |
|\ | ||||||
| * | 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 | |||||
| * | Improve generic message exception logging. Quieten down complaints about ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -2/+4 | |
| | | | | | | | | unhandled GenericMessages | |||||
| * | Add client name to packet resend log messages to make them a bit more ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -3/+7 | |
| | | | | | | | | informative | |||||
| * | Remove SceneGraph.DetachObject() which was accidentally left around after ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -10/+0 | |
| | | | | | | | | being migrated to AttachmentsModule | |||||
| * | Rename now protected method SetAttachmentInventoryStatus() to ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -4/+4 | |
| | | | | | | | | ShowAttachInUserInventory() to match ShowDetachInUserInventory() | |||||
| * | Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface | Justin Clark-Casey (justincc) | 2010-09-13 | 2 | -16/+13 | |
| | | | | | | | | 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 | |||||
| * | If attachment fails (e.g. because asset wasn't found) then don't try to set ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -4/+2 | |
| | | | | | | | | | | | | attachment as shown in inventory Doing this results in a null reference exception | |||||
| * | minor: Clean up log messages generated when an item is attached | Justin Clark-Casey (justincc) | 2010-09-13 | 3 | -12/+8 | |
| | | ||||||
* | | Add a missing parenthesis | Melanie | 2010-09-13 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-13 | 1 | -4/+6 | |
|\ \ | |/ | ||||||
| * | * Fixing length calculations for HTTP texture downloads (the end byte is ↵ | John Hurliman | 2010-09-13 | 1 | -4/+6 | |
| | | | | | | | | inclusive in Range: headers) | |||||
* | | Change the help message to point to copying OpenSimDefaults.ini.example. | Melanie | 2010-09-13 | 1 | -1/+1 | |
| | | | | | | | | Provide a mostly empty OpenSim.ini.example | |||||
* | | Output an error and quit if the master file is missing. Also rename | Melanie | 2010-09-13 | 1 | -4/+16 | |
| | | | | | | | | OpenSim.ini.example to bin/OpenSimDefaults.ini.example | |||||
* | | Make the inimaster option default to OpenSimDefaults.ini. | Melanie | 2010-09-13 | 1 | -1/+1 | |
|/ | ||||||
* | Merged | John Hurliman | 2010-09-12 | 62 | -507/+523 | |
|\ | ||||||
| * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 62 | -509/+498 | |
| | | ||||||
| * | Add copyright headers. | Jeff Ames | 2010-09-12 | 1 | -0/+27 | |
| | | ||||||
* | | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 11 | -169/+165 | |
|/ | | | | | * 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 | |
| | ||||||
* | Prevent child agents from being blacklisted in the kill record. | Melanie | 2010-09-11 | 1 | -3/+6 | |
| | ||||||
* | Make it clear that the "create region" command will reference ini files in ↵ | Justin Clark-Casey (justincc) | 2010-09-11 | 1 | -5/+6 | |
| | | | | | | the regions directory (usually Regions/) Also convert some tabs into spaces. | |||||
* | 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 | 22 | -369/+245 | |
| | ||||||
* | Over a dozen thread safety fixes in FriendsModule | John Hurliman | 2010-09-09 | 1 | -167/+163 | |
| | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-08 | 2 | -6/+10 | |
|\ | ||||||
| * | Made the HG asset and inventory brokers use the Helo service in order to ↵ | Diva Canto | 2010-09-08 | 1 | -6/+9 | |
| | | | | | | | | instantiate the right network connectors. Tested on Robust only. | |||||
| * | Renamed the Helo server connector to a consistent name. Added this in ↵ | Diva Canto | 2010-09-08 | 1 | -0/+1 | |
| | | | | | | | | connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule. | |||||
* | | * Changed 11 calls for session info to the more optimized API method | John Hurliman | 2010-09-08 | 3 | -79/+35 | |
|/ | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-08 | 6 | -9/+21 | |
|\ | ||||||
| * | Rolling back the recent libomv update but keeping the ExpiringCache cleanups ↵ | John Hurliman | 2010-09-07 | 4 | -8/+8 | |
| | | | | | | | | (as much as is possible). There was a report of non-finite avatar positions after the update | |||||
| * | * Cache null account responses in the SimianUserAccountServiceConnector to ↵ | John Hurliman | 2010-09-07 | 6 | -10/+17 | |
| | | | | | | | | | | | | avoid repeated requests for missing avatar IDs * Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache | |||||
| * | Make sure unlinked child prims get persisted | Melanie | 2010-09-07 | 1 | -0/+5 | |
| | | ||||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-07 | 2 | -5/+14 | |
| |\ | ||||||
| * | | Fix deletion persistence when freshly delinked prims are removed | Justin Clark-Casey (justincc) | 2010-09-07 | 6 | -42/+58 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion. This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart). However, DeRezObjects() deleted to user inventory, which is not required by llDie() or direct region module unlink and deletion. Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path. Uncommented TestDelinkPersistence() since this now passes. Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts. | |||||
* | | | If a scene object part UUID is changed (only possible when not in a scene), ↵ | Justin Clark-Casey (justincc) | 2010-09-07 | 3 | -3/+12 | |
| |/ |/| | | | | | then adjust the inventory items to point to the new uuid as well | |||||
* | | minor: comment out some excessive test logging | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -3/+12 | |
|\ \ | ||||||
| * | | Fix yet another cause of "Ghost attachments" | Melanie Thielker | 2010-09-06 | 1 | -3/+12 | |
| | | | ||||||
* | | | Fix deletion persistence when freshly delinked prims are removed | Justin Clark-Casey (justincc) | 2010-09-07 | 6 | -42/+58 | |
| |/ |/| | | | | | | | | | | | | | | | | | Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion. This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart). However, DeRezObjects() deleted to user inventory, which is required by llDie() or direct region module unlink and deletion. Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path. Uncommented TestDelinkPersistence() since this now passes. Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts. | |||||
* | | Add test that checks correct persistence when an unlink is quickly followed ↵ | Justin Clark-Casey (justincc) | 2010-09-06 | 1 | -9/+40 | |
| | | | | | | | | | | | | by deletion of a linked part This test is temporarily not running since it currently fails due to a bug in this area | |||||
* | | Make console backup command do a forced backup rather than non-forced | Justin Clark-Casey (justincc) | 2010-09-06 | 4 | -8/+3 | |
| | | | | | | | | Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally |