Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 2 | -4/+4 |
|\ | | | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-16 | 1 | -3/+3 |
| |\ | |||||
| | * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-09-16 | 1 | -3/+3 |
| | | | |||||
| * | | Changed SceneObjectGroup to store parts with the fast and thread-safe ↵ | John Hurliman | 2010-09-16 | 1 | -1/+1 |
| |/ | | | | | | | MapAndArray collection | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 6 | -42/+112 |
|\ \ | |/ | | | | | | | 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. | ||||
| * | 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 | 6 | -31/+30 |
| |\ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 6 | -31/+30 |
| | | | |||||
| * | | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 2 | -9/+6 |
| |/ | | | | | | | | | * 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 | ||||
| * | Changed all string references of "IRegionDataStore" to "ISimulationDataStore" | John Hurliman | 2010-09-11 | 1 | -1/+0 |
| | | |||||
| * | Fixed the naming mess around data connectors for simulation data | John Hurliman | 2010-09-11 | 1 | -1/+1 |
| | | |||||
| * | Fix deletion persistence when freshly delinked prims are removed | Justin Clark-Casey (justincc) | 2010-09-07 | 3 | -15/+69 |
| | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 5 | -5/+212 |
|\ \ | |||||
| * | | Fix deletion persistence when freshly delinked prims are removed | Justin Clark-Casey (justincc) | 2010-09-07 | 3 | -15/+69 |
| |/ | | | | | | | | | | | | | | | | | | | 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 to check persistence of newly added pre-linked objects | Justin Clark-Casey (justincc) | 2010-09-06 | 3 | -3/+156 |
| | | | | | | | | | | 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-08-30 | 2 | -16/+23 |
|\ \ | |/ | |||||
| * | allow inventory path specified in "load iar" to start with a / (e.g. ↵ | Justin Clark-Casey (justincc) | 2010-08-27 | 1 | -12/+12 |
| | | | | | | | | /Objects is now valid where it wasn't before) | ||||
| * | refactor: Make IAR tests set up standard iar for loading | Justin Clark-Casey (justincc) | 2010-08-27 | 1 | -4/+11 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 3 | -13/+36 |
|\ \ | |/ | |||||
| * | Add automated test at the opensim 'api' level to check that a given item ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 3 | -13/+36 |
| | | | | | | | | | | | | goes to the correct directory Also removes some mono compiler warnings | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 1 | -8/+48 |
|\ \ | |/ | |||||
| * | Unit test breakage fix. | Diva Canto | 2010-08-20 | 1 | -8/+48 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 2 | -2/+6 |
|\ \ | |/ | |||||
| * | Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files ↵ | Diva Canto | 2010-08-16 | 1 | -0/+4 |
| | | | | | | | | affected. | ||||
| * | Work on TeleportStart: renamed method from TeleportLocationStart to ↵ | Diva Canto | 2010-08-16 | 1 | -1/+1 |
| | | | | | | | | TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule). | ||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2010-08-13 | 1 | -1/+1 |
| | | |||||
| * | Major attachments cleanup. Remove unused AttachObject ClientView method | Melanie | 2010-07-14 | 1 | -4/+0 |
| | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters | ||||
* | | Implement CreateNewOutfitAttachments. This addresses mantis #199. | Tom | 2010-08-06 | 1 | -1/+1 |
| | | |||||
* | | Major attachments cleanup. Remove unused AttachObject ClientView method | Melanie Thielker | 2010-07-14 | 1 | -4/+0 |
| | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters | ||||
* | | Provide the interface for StoreAsset to report success or failure | Tom Grimshaw | 2010-06-28 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-18 | 1 | -6/+6 |
|\ \ | |/ | |||||
| * | Fix problem where iar load would duplicate huge number of folders | Justin Clark-Casey (justincc) | 2010-06-18 | 1 | -6/+6 |
| | | | | | | | | | | This was http://opensimulator.org/mantis/view.php?id=4770 Extend unit tests to check for this scenario too | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -0/+4 |
|\ \ | |/ | |||||
| * | Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet | Melanie | 2010-06-12 | 1 | -0/+4 |
| | | | | | | | | we used to send before slimupdates and explicitly send it | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 2 | -12/+52 |
|\ \ | |/ | |||||
| * | Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 1 | -5/+0 |
| | | | | | | | | | | | | GetFolder(InventoryFolderBase folder)" This reverts commit 3525195bc9b5fdfd9799411edd452981ef1f4ebd. | ||||
| * | Allow IInventoryService.GetFolder(folderId, userId) as well as ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 1 | -0/+5 |
| | | | | | | | | | | | | | | GetFolder(InventoryFolderBase folder) This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood. This is in line with other methods that alraedy allow requests via uuid | ||||
| * | create inactive test for iar folders/items merged with existing paths | Justin Clark-Casey (justincc) | 2010-06-11 | 2 | -12/+52 |
| | | | | | | | | add various helper functions for simplifying test readability | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-04 | 3 | -61/+11 |
|\ \ | |/ | |||||
| * | remove pointless mock user account service since the real one can now be ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 2 | -59/+6 |
| | | | | | | | | easily configured for test purposes | ||||
| * | get TestSaveIarV0_1() working again by setting up an ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 2 | -2/+5 |
| | | | | | | | | | | | | OpenSim.Data.Null.UserAuthenticationData plugin additional tweaks to get this working properly | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-28 | 2 | -80/+121 |
|\ \ | |/ | |||||
| * | get TestSaveIarV0_1() uncommented but not running as a test yet since I ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 2 | -4/+37 |
| | | | | | | | | didn't get the authentication server to work and my brain is about to fizzle out my ears | ||||
| * | restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -1/+12 |
| | | | | | | | | work with the new UserAccountService/InventoryService | ||||
| * | fission UserAccountService.HandleCreateUser() into two methods, one which ↵ | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -81/+78 |
| | | | | | | | | handles user command parsing and another which actually does the work | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-23 | 1 | -0/+5 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Added overload of SendGenericMessage to LLClientView with string list as ↵ | Mikko Pallari | 2010-05-21 | 1 | -0/+5 |
| | | | | | | | | parameter. Now modules themselfs don't necessarily need to convert strings to byte arrays. Added this as it was removed in LightShare patch. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 3 | -9/+17 |
|\ \ | |/ | |||||
| * | * Moving all of the prioritization/reprioritization code into a new file ↵ | John Hurliman | 2010-05-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Prioritizer.cs * Simplified the interest management code to make it easier to add new policies. Prioritization and reprioritization share code paths now * Improved the distance and front back policies to always give your avatar the highest priority | ||||
| * | extend TestAddSceneObject() to check Scene.AddNewSceneObject() return boolean | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -2/+0 |
| | | | | | | | | improve test to retrieve object by known uuid rather than dynamically assigned local id |