Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 88 | -1559/+1401 |
|\ | | | | | | | | | 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 | 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 | ||||
| * | | 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 | ||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-09-11 | 1 | -1/+4 |
|\ \ \ | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | 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. | ||||
* | | | | Prevent child agents from being blacklisted in the kill record. | Melanie | 2010-09-11 | 1 | -3/+6 |
|/ / / | |||||
* | | | 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 | 13 | -60/+165 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-09-07 | 2 | -5/+14 |
| |\ \ | | |/ | |||||
| | * | 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. | ||||
| * | | | 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. | ||||
| * | | 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 | ||||
| * | | extend TestNewSceneObjectLinkPersistence() to check for presence of non-root ↵ | Justin Clark-Casey (justincc) | 2010-09-06 | 1 | -2/+3 |
| | | | | | | | | | | | | linked prim | ||||
| * | | Add test to check persistence of newly added pre-linked objects | Justin Clark-Casey (justincc) | 2010-09-06 | 7 | -21/+78 |
| |/ | | | | | | | | | Added a MockRegionDataPlugin to do in-memory persistence for tests since adding this to OpenSim.Data.Null.NullDataStore doesn't seem appropriate NullDataStore can do nothing because OpenSim only ever retrieve region objects from the database on startup. Adding an in-memory store here would be unecessary overhead. | ||||
| * | Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because | Melanie Thielker | 2010-09-06 | 2 | -4/+36 |
| | | | | | | | | modules need to see it (Search!) even if it comes in via CAPS | ||||
| * | Add missing IDwellModule interface | Melanie | 2010-09-05 | 1 | -0/+37 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2010-09-06 | 24 | -159/+302 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Fix yet another cause of "Ghost attachments" | Melanie Thielker | 2010-09-06 | 1 | -3/+12 |
| | | | |||||
| * | | Don't turn off the sale settings on child prims when linking, and on copy | Melanie Thielker | 2010-09-06 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | of prims anymore. The behavior now matches SL and can be used to link vendor prims for transport | ||||
| * | | Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because | Melanie Thielker | 2010-09-06 | 2 | -4/+36 |
| | | | | | | | | | | | | modules need to see it (Search!) even if it comes in via CAPS | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 14 | -90/+90 |
| |\ \ | | |/ |