Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| | * | 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 | 2 | -6/+1 |
| | | | | | | | | 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 | 1 | -1/+25 |
| | | | | | | | | 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 | 6 | -29/+91 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | 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 | 1 | -1/+25 |
| | | | | | | | | | | | | modules need to see it (Search!) even if it comes in via CAPS | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 2 | -18/+43 |
| |\ \ | | |/ | |||||
| | * | Logout the presence if client IP verification fails. | Diva Canto | 2010-09-04 | 1 | -0/+2 |
| | | | |||||
| | * | Move code that allows llGiveInvetory() to move item into appropriate system ↵ | Justin Clark-Casey (justincc) | 2010-09-04 | 1 | -8/+40 |
| | | | | | | | | | | | | | | | | | | | | | folder up from connectors into Scene.Inventory.cs This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors. Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway. | ||||
| | * | Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item) | Justin Clark-Casey (justincc) | 2010-09-04 | 1 | -8/+27 |
| | | | | | | | | | | | | The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 1 | -0/+21 |
| |\ \ | | |/ | |||||
| | * | Fix an issue with rezzing scripted objects. | Melanie Thielker | 2010-09-03 | 1 | -2/+2 |
| | | | |||||
| | * | Remove commented code and the comment, as the change has proven out | Melanie Thielker | 2010-09-02 | 1 | -3/+0 |
| | | | |||||
| | * | Experimentally comment the sending of unbaked avatars | Melanie Thielker | 2010-09-02 | 1 | -1/+3 |
| | | | |||||
| | * | refactor: move SOG.AttachToAgent() into AttachmentsModule | Justin Clark-Casey (justincc) | 2010-09-01 | 1 | -71/+0 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-09-01 | 3 | -3/+3 |
| | |\ | |||||
| | | * | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | script state enum to reflect recent changes. | ||||
| | * | | Add ScenePresence.GetAttachments(uint attachmentPoint) | Justin Clark-Casey (justincc) | 2010-08-31 | 1 | -0/+21 |
| | |/ | |||||
| * | | Fix an issue with rezzing scripted objects. | Melanie Thielker | 2010-09-03 | 1 | -2/+2 |
| | | | |||||
* | | | Falling animation fix, comment out instrumentation. | Kitto Flora | 2010-09-06 | 2 | -40/+61 |
|/ / | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2010-09-02 | 4 | -19/+7 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Remove commented code and the comment, as the change has proven out | Melanie Thielker | 2010-09-02 | 1 | -3/+0 |
| | | | |||||
| * | | Experimentally comment the sending of unbaked avatars | Melanie Thielker | 2010-09-02 | 1 | -1/+3 |
| | | |