Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-15 | 2 | -3/+18 | |
|\ | ||||||
| * | Fix the above | Melanie | 2010-09-14 | 1 | -4/+3 | |
| | | ||||||
| * | Allow to place the connection strings and providers for estate and region | Melanie | 2010-09-14 | 2 | -0/+16 | |
| | | | | | | | | | | in their oqn sections, for those of us who don't want a catch-all DatabaseService section. | |||||
* | | rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve ↵ | Justin Clark-Casey (justincc) | 2010-09-15 | 4 | -4/+4 | |
| | | | | | | | | 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 | |||||
* | Remove long unused Region/Framework/ThreadTracker | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -46/+0 | |
| | | | | All methods had already been deleted, only GetThreads() was left | |||||
* | Fix "show threads" to show threads now being managed by ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 2 | -18/+22 | |
| | | | | OpenSim.Framework.Watchdog | |||||
* | fix OpenSim.Tests.ConfigurationLoaderTest to satisfy requirement that ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -1/+1 | |
| | | | | | | OpenSimDefaults.ini is present this should allow the testsuite to run again and the autobuild to complete | |||||
* | 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 | |
|/ | ||||||
* | Fix unit test SceneSetupHelpers to load the mock simulation data store | John Hurliman | 2010-09-12 | 2 | -1/+76 | |
| | ||||||
* | Merged | John Hurliman | 2010-09-12 | 96 | -778/+922 | |
|\ | ||||||
| * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 92 | -774/+756 | |
| | | ||||||
| * | Add copyright headers. | Jeff Ames | 2010-09-12 | 7 | -6/+168 | |
| | | ||||||
* | | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 25 | -227/+404 | |
|/ | | | | | * 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 | 3 | -20/+227 | |
| | | | | 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 | 5 | -8/+2 | |
| | ||||||
* | Fixed the naming mess around data connectors for simulation data | John Hurliman | 2010-09-11 | 13 | -23/+23 | |
| | ||||||
* | Re-enabled asset last access time logging in MySQL | John Hurliman | 2010-09-11 | 1 | -3/+0 | |
| | ||||||
* | 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 | 4 | -6/+61 | |
| | | | | prevented passwords from being echoed after enter is pressed. | |||||
* | Remove parenthesis around the release flavour to get the version string back ↵ | Justin Clark-Casey (justincc) | 2010-09-10 | 1 | -1/+1 | |
| | | | | | | under 27 chars Can't quite remember why this has to be <=27 chars, maybe something to do with the space available for the version string in a typical client | |||||
* | 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 | 25 | -392/+249 | |
| | ||||||
* | * Run SimianGrid session updates asynchronously instead of from the main ↵ | John Hurliman | 2010-09-09 | 6 | -66/+5 | |
| | | | | | | heartbeat thread * Minor dead code cleanup | |||||
* | 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 | 6 | -16/+38 | |
|\ | ||||||
| * | Made the HG asset and inventory brokers use the Helo service in order to ↵ | Diva Canto | 2010-09-08 | 2 | -14/+24 | |
| | | | | | | | | 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 | 2 | -2/+4 | |
| | | | | | | | | connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule. | |||||
| * | Added constructor that takes an URL to asset and inventory simian connectors. | Diva Canto | 2010-09-08 | 2 | -0/+10 | |
| | | ||||||
* | | * Changed 11 calls for session info to the more optimized API method | John Hurliman | 2010-09-08 | 4 | -81/+37 | |
|/ | ||||||
* | No need for a config var for the HELO message on the server-side. It's robust. | Diva Canto | 2010-09-08 | 1 | -8/+1 | |
| |