aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-108-346/+221
|
* 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
| * Make sure unlinked child prims get persistedMelanie2010-09-071-0/+5
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-071-2/+2
| |\
| * | 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.
* | | 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
* | 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.
* 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
* Add missing IDwellModule interfaceMelanie2010-09-051-0/+37
|
* 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.
* 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
|/
* Implements parcel media setting persistence and packet / CAPS handlingJonathan Freedman2010-08-301-1/+2
| | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com>
* Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-285-75/+84
|
* minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-08-261-3/+4
|
* refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module ↵Justin Clark-Casey (justincc)2010-08-261-47/+0
| | | | since this appears to relate solely to attachments
* refactor: break out attachment position change code in ↵Justin Clark-Casey (justincc)2010-08-262-24/+21
| | | | | | Scene.UpdatePrimPosition() and move into AttachmentsModule This allows region modules to change attachment positions.
* Remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-267-36/+7
|
* Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim()Justin Clark-Casey (justincc)2010-08-261-2/+16
| | | | By the time a scheduled update is triggered, a sog may have been removed from the scene. This change prevents NullReferenceExceptions in these situations.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-262-27/+38
|\ | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Make scene object directories more robust and prevent deleted SOP's fromMelanie Thielker2010-08-252-18/+29
| | | | | | | | sticking around
* | replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is ↵Justin Clark-Casey (justincc)2010-08-261-1/+1
| | | | | | | | always 0 (and any other number would cause an error anyway)
* | Improve consistency of locking for SOG.m_parts in order to avoid race ↵Justin Clark-Casey (justincc)2010-08-266-136/+205
| | | | | | | | conditions in linking and unlinking
* | If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUIDJustin Clark-Casey (justincc)2010-08-251-1/+10
| | | | | | | | Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed
* | refactor: Push item retrieval and fixing part of Scene.RezObject() down into ↵Justin Clark-Casey (justincc)2010-08-253-55/+82
|/ | | | SceneObjectPartInventory
* Split out actual scene object insertion code from Scene.Inventory.RezObject ↵Justin Clark-Casey (justincc)2010-08-243-25/+62
| | | | | | | | 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
* refactor: make RezObject() more readableJustin Clark-Casey (justincc)2010-08-241-69/+68
|
* add test to check move of task item to user inventory when a target folder ↵Justin Clark-Casey (justincc)2010-08-241-0/+26
| | | | is explicitly given
* minor: stop test using obsolete propertyJustin Clark-Casey (justincc)2010-08-241-1/+1
|
* refactor TestMoveTaskInventoryItemNoParent()Justin Clark-Casey (justincc)2010-08-241-24/+37
|
* Add automated test at the opensim 'api' level to check that a given item ↵Justin Clark-Casey (justincc)2010-08-242-1/+105
| | | | | | goes to the correct directory Also removes some mono compiler warnings
* minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.csJustin Clark-Casey (justincc)2010-08-231-1/+5
|
* Remove various warnings and improve logging messages. No functional changes.Justin Clark-Casey (justincc)2010-08-231-2/+4
|
* Unit test breakage fix.Diva Canto2010-08-202-6/+11
|
* Cleaned up a few more things related to incoming agents.Diva Canto2010-08-201-45/+42
|
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-201-25/+27
|\