aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* reorder some code to avoid merge issues in the futureMelanie2010-09-141-5/+5
|
* Fix merge issuesMelanie2010-09-142-5/+2
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-144-15/+14
|\
| * Comment out SOG storing debug log messageJustin Clark-Casey (justincc)2010-09-141-3/+3
| | | | | | | | This can get very spammy with regularly changing objects. Please uncomment if required.
| * minor: Add comments which explain what's going on wrt avatar movements at ↵Justin Clark-Casey (justincc)2010-09-132-0/+6
| | | | | | | | various points in the main scene loop and associated methods
| * Remove SceneGraph.DetachObject() which was accidentally left around after ↵Justin Clark-Casey (justincc)2010-09-131-10/+0
| | | | | | | | being migrated to AttachmentsModule
| * minor: Clean up log messages generated when an item is attachedJustin Clark-Casey (justincc)2010-09-131-9/+3
| |
* | Fix a small left over buglet and also add checking of the physics actorMelanie Thielker2010-09-141-0/+10
| | | | | | | | | | position on backup. This way, ant object that has been moved will be checked for ghost prims as soon as it is persisted.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1318-690/+541
|\ \ | |/ | | | | | | 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.
| * MergedJohn Hurliman2010-09-1216-72/+99
| |\
| | * Formatting cleanup.Jeff Ames2010-09-1216-74/+74
| | |
| | * Add copyright headers.Jeff Ames2010-09-121-0/+27
| | |
| * | * Added ISimulationDataService and IEstateDataServiceJohn Hurliman2010-09-125-37/+77
| |/ | | | | | | | | * 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 readableJohn Hurliman2010-09-111-138/+124
| |
| * Fixed the naming mess around data connectors for simulation dataJohn Hurliman2010-09-113-4/+4
| |
| * Made it impossible to create a user with names containing spaces and ↵randomhuman2010-09-101-2/+3
| | | | | | | | prevented passwords from being echoed after enter is pressed.
| * Second pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-103-58/+35
| |
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-107-344/+219
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-083-3/+10
| |\
| | * * Cache null account responses in the SimianUserAccountServiceConnector to ↵John Hurliman2010-09-071-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-072-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 anMelanie Thielker2010-09-081-1/+4
| | | | | | | | | | | | object out of the scene and then put it back in.
* | | Fix some issues with unlinkingMelanie Thielker2010-09-071-56/+53
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-071-0/+2
|\ \ \ | | |/ | |/|
| * | Make sure unlinked child prims get persistedMelanie2010-09-071-0/+5
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-0711-58/+163
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-071-2/+2
| |\ \ | | |/
| | * minor: comment out some excessive test loggingJustin Clark-Casey (justincc)2010-09-071-1/+1
| | |
| | * Fix deletion persistence when freshly delinked prims are removedJustin Clark-Casey (justincc)2010-09-076-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 removedJustin Clark-Casey (justincc)2010-09-076-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-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-062-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-061-2/+3
| | | | | | | | linked prim
| * Add test to check persistence of newly added pre-linked objectsJustin Clark-Casey (justincc)2010-09-067-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, becauseMelanie Thielker2010-09-061-1/+25
| | | | | | | | modules need to see it (Search!) even if it comes in via CAPS
* | Merge branch 'careminster-presence-refactor' of ↵Kitto Flora2010-09-066-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 copyMelanie Thielker2010-09-061-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, becauseMelanie Thielker2010-09-061-1/+25
| | | | | | | | | | | | modules need to see it (Search!) even if it comes in via CAPS
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-052-18/+43
| |\ \ | | |/
| | * Logout the presence if client IP verification fails.Diva Canto2010-09-041-0/+2
| | |
| | * Move code that allows llGiveInvetory() to move item into appropriate system ↵Justin Clark-Casey (justincc)2010-09-041-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-041-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-refactorMelanie2010-09-031-0/+21
| |\ \ | | |/
| | * Fix an issue with rezzing scripted objects.Melanie Thielker2010-09-031-2/+2
| | |
| | * Remove commented code and the comment, as the change has proven outMelanie Thielker2010-09-021-3/+0
| | |
| | * Experimentally comment the sending of unbaked avatarsMelanie Thielker2010-09-021-1/+3
| | |
| | * refactor: move SOG.AttachToAgent() into AttachmentsModuleJustin Clark-Casey (justincc)2010-09-011-71/+0
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-013-3/+3
| | |\
| | | * Adjust the "Magic numbers" we use because we can't reference the actualMelanie Thielker2010-08-313-3/+3
| | | | | | | | | | | | | | | | script state enum to reflect recent changes.
| | * | Add ScenePresence.GetAttachments(uint attachmentPoint)Justin Clark-Casey (justincc)2010-08-311-0/+21
| | |/