aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-0719-65/+379
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-072-5/+14
| |\
| | * minor: comment out some excessive test loggingJustin Clark-Casey (justincc)2010-09-071-1/+1
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-071-3/+12
| | |\
| | | * Fix yet another cause of "Ghost attachments"Melanie Thielker2010-09-061-3/+12
| | | |
| | * | Fix deletion persistence when freshly delinked prims are removedJustin Clark-Casey (justincc)2010-09-0710-57/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 removedJustin Clark-Casey (justincc)2010-09-0710-57/+129
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061-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-forcedJustin Clark-Casey (justincc)2010-09-064-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-061-2/+3
| | | | | | | | | | | | linked prim
| * | Add test to check persistence of newly added pre-linked objectsJustin Clark-Casey (justincc)2010-09-0610-24/+234
| |/ | | | | | | | | 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, becauseMelanie Thielker2010-09-062-4/+36
| | | | | | | | modules need to see it (Search!) even if it comes in via CAPS
* | Merge branch 'careminster-presence-refactor' of ↵Kitto Flora2010-09-0665-674/+1003
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Fix yet another cause of "Ghost attachments"Melanie Thielker2010-09-061-3/+12
| | |
| * | Don't turn off the sale settings on child prims when linking, and on copyMelanie Thielker2010-09-061-8/+0
| | | | | | | | | | | | | | | of prims anymore. The behavior now matches SL and can be used to link vendor prims for transport
| * | Revert "Workaround for mono bug #312968"Melanie Thielker2010-09-061-1/+0
| | | | | | | | | | | | | | | | | | This reverts commit f2e343d53081dbd6956d39b1e172e171101a4900. Doesn't compile with our version of Mono. Patched Mono instead.
| * | Workaround for mono bug #312968Melanie Thielker2010-09-061-0/+1
| | |
| * | Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, becauseMelanie Thielker2010-09-062-4/+36
| | | | | | | | | | | | modules need to see it (Search!) even if it comes in via CAPS
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-059-110/+180
| |\ \ | | |/
| | * Fix a handful of copypaste errorsMelanie2010-09-054-4/+4
| | |
| | * Change UserAccountService to matchMelanie2010-09-051-12/+22
| | |
| | * Make Simian profiles respect the module chosen in [Profile]Melanie2010-09-051-2/+10
| | |
| | * Fix up presence connector in SimianGridMelanie2010-09-051-12/+22
| | |
| | * Fix up Simian inentoryMelanie2010-09-051-18/+30
| | |
| | * Friends works differently, it' snot even a region module at all, but a connectorMelanie2010-09-051-16/+1
| | | | | | | | | | | | that is loaded by the core friends module. Change Simian to match.
| | * And the avatar services :)Melanie2010-09-051-12/+22
| | |
| | * Add the m_Enabled pattern to Simian AuthMelanie2010-09-051-12/+22
| | |
| | * Add m_Enabled pattern to SimianGridConnectorMelanie2010-09-051-14/+28
| | |
| | * As an exmple, add the code to disable connectors intot he simian assetMelanie2010-09-051-12/+23
| | | | | | | | | | | | connector
| | * Add missing IDwellModule interfaceMelanie2010-09-051-0/+37
| | |
| | * Fix build breakMelanie2010-09-051-4/+0
| | |
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-0541-428/+546
| |\ \ | | |/
| | * Remove "Dwell" support from core and replace it with calls to methodsMelanie Thielker2010-09-0510-102/+72
| | | | | | | | | | | | on IDwellModule
| | * Logout the presence if client IP verification fails.Diva Canto2010-09-041-0/+2
| | |
| | * One more debug message to track an issue on Danger grid.Diva Canto2010-09-041-0/+1
| | |
| | * Make User Agent Service and Login Service separable.Diva Canto2010-09-046-32/+81
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-046-3/+49
| | |\
| | | * Added XFF header processing. Untested, for lack of proxy.Diva Canto2010-09-036-3/+49
| | | |
| | * | Move code that allows llGiveInvetory() to move item into appropriate system ↵Justin Clark-Casey (justincc)2010-09-048-80/+56
| | |/ | | | | | | | | | | | | | | | | | | 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-043-14/+33
| | | | | | | | | | | | 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' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-031-22/+19
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-034-12/+37
| | | |\
| | | * | Make SimianFriendsServiceConnector initialize like the other connectors and ↵John Hurliman2010-09-031-22/+19
| | | | | | | | | | | | | | | | | | | | gracefully handle the case where it is loaded but disabled #monoaddinslol
| | * | | minor: remove mono compiler warningsJustin Clark-Casey (justincc)2010-09-033-92/+91
| | | |/ | | |/|
| | * | In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod ↵Justin Clark-Casey (justincc)2010-09-033-11/+36
| | | | | | | | | | | | | | | | | | | | | | | | rather than an older XML one This is a patch from http://opensimulator.org/mantis/view.php?id=4973. Thanks randomhuman
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-0311-165/+166
| | |\ \ | | | |/
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-031-2/+3
| | | |\
| | | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-037-13/+43
| | | |\ \
| | | * | | * Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors ↵John Hurliman2010-09-0311-165/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to handle initialization as graceful as possible with the current broken way region module initialization is done * Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side)
| | * | | | minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-09-031-1/+1
| | | |_|/ | | |/| |