| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Enforce region agent limit as set in estate tools | Melanie | 2010-09-30 | 1 | -0/+8 |
| | | |||||
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -9/+5 |
| |\ | | | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| | * | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 1 | -9/+5 |
| | | | | | | | | | MapAndArray collection | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-16 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve ↵ | Justin Clark-Casey (justincc) | 2010-09-15 | 1 | -1/+1 |
| | | | | | | | | | code readability | ||||
| * | | reorder some code to avoid merge issues in the future | Melanie | 2010-09-14 | 1 | -5/+5 |
| | | | |||||
| * | | Fix merge issues | Melanie | 2010-09-14 | 1 | -3/+0 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 1 | -0/+7 |
| |\ \ | |/ | |||||
| | * | minor: Add comments which explain what's going on wrt avatar movements at ↵ | Justin Clark-Casey (justincc) | 2010-09-13 | 1 | -0/+4 |
| | | | | | | | | | various points in the main scene loop and associated methods | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -203/+226 |
| |\ \ | |/ | | | | | | | 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 | 1 | -7/+7 |
| | |\ | |||||
| | | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -9/+9 |
| | | | | |||||
| | * | | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 1 | -31/+71 |
| | |/ | | | | | | | | | * 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 | ||||
| | * | Shuffling fields and properties around in Scene to make Scene.cs more readable | John Hurliman | 2010-09-11 | 1 | -138/+124 |
| | | | |||||
| | * | 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. | ||||
| | * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 1 | -24/+21 |
| | | | |||||
| | * | Fix deletion persistence when freshly delinked prims are removed | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -9/+16 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | 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. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 1 | -13/+24 |
| |\ \ | |||||
| | * | | Fix deletion persistence when freshly delinked prims are removed | Justin Clark-Casey (justincc) | 2010-09-07 | 1 | -9/+16 |
| | |/ | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | Make console backup command do a forced backup rather than non-forced | Justin Clark-Casey (justincc) | 2010-09-06 | 1 | -5/+0 |
| | | | | | | | | | Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally | ||||
| | * | Add test to check persistence of newly added pre-linked objects | Justin Clark-Casey (justincc) | 2010-09-06 | 1 | -2/+11 |
| | | | | | | | | | | | 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. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 1 | -0/+2 |
| |\ \ | |/ | |||||
| | * | Logout the presence if client IP verification fails. | Diva Canto | 2010-09-04 | 1 | -0/+2 |
| | | | |||||
| | * | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | | | script state enum to reflect recent changes. | ||||
| * | | Prevent Meta7 plants from being treated like dropped attachments and removed | Melanie Thielker | 2010-09-01 | 1 | -1/+1 |
| | | | | | | | | | from the sim. | ||||
| * | | Improve sim health reporting. Output error message if heartbeat thread is ↵ | Melanie Thielker | 2010-09-01 | 1 | -1/+2 |
| | | | | | | | | | restarted by scene. This may help to find out why this recovery mechanism isn't working. | ||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-08-31 | 1 | -2/+3 |
| |\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * \ | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-30 | 1 | -21/+77 |
| | |\ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | | Kick the user from the region in the circumstance that the TP home failed - ↵ | meta7 | 2010-08-30 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | ONLY if it was triggered by an estate ban. This makes baby jesus cry, and should be fixed to search for alternative regions if the home region is unavailable. | ||||
| * | | | | Adjust the "Magic numbers" we use because we can't reference the actual | Melanie Thielker | 2010-08-31 | 1 | -1/+1 |
| | |/ / |/| | | | | | | | | script state enum to reflect recent changes. | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 1 | -22/+11 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Improve liveness by operating on list copies of SOG.Children where appropriate | Justin Clark-Casey (justincc) | 2010-08-28 | 1 | -10/+11 |
| | | | | |||||
| | * | | Remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -12/+0 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 1 | -14/+20 |
| |\ \ \ | |/ / | | | | | | | This was rather conflicted. Please test linking. | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -1/+0 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| | * | | | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -15/+20 |
| | | | | | | | | | | | | | | | | | conditions in linking and unlinking | ||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 1 | -2/+18 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Make scene object directories more robust and prevent deleted SOP's from | Melanie Thielker | 2010-08-25 | 1 | -1/+0 |
| | |/ / | | | | | | | | | | sticking around | ||||
| | * | | Split out actual scene object insertion code from Scene.Inventory.RezObject ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -1/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | and move into SceneGraph.AddNewSceneObject() The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages. This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module This code does not touch direct rez by a user | ||||
| * | | | Change object cleanup again. Make scene object directories more robust and | Melanie Thielker | 2010-08-25 | 1 | -2/+1 |
| | | | | | | | | | | | | | prevent deleted SOP's from sticking around | ||||
| * | | | Correct a logic error in attachment cleanup | Melanie Thielker | 2010-08-25 | 1 | -4/+9 |
| | | | | |||||
| * | | | Lock the attachment cleanup so it doesn't go into an endless deletion frenzy | Melanie Thielker | 2010-08-25 | 1 | -16/+20 |
| | | | | |||||
| * | | | Call the cleanup after saving attachment states, so that the attachments | Melanie Thielker | 2010-08-24 | 1 | -1/+3 |
| | | | | | | | | | | | | | don't get killed before they can be saved | ||||
| * | | | Call the Cleanup when an agent logs out, when an agent leaves and just | Melanie Thielker | 2010-08-24 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | before an agent logs in directly. Intentionally not calling this from MakeRoot as that would mess up attachment transfer in teleport | ||||
| * | | | Add a method to delete left over / dropped attachments | Melanie Thielker | 2010-08-24 | 1 | -0/+32 |
| | |/ |/| | |||||
| * | | Add printing the default script engine name. Report real exceptions when | Melanie Thielker | 2010-08-22 | 1 | -2/+3 |
| | | | | | | | | | | | there is an issue with the config file, as a typo could cause configuration to silently fail. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 1 | -48/+47 |
| |\ \ | |/ | |||||
| | * | Cleaned up a few more things related to incoming agents. | Diva Canto | 2010-08-20 | 1 | -45/+42 |
| | | | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-20 | 1 | -25/+27 |
| | |\ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |