aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-181-2/+2
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * Fix a bug where changing shape parameters of a child prim in a linkset would ↵Justin Clark-Casey (justincc)2012-02-181-2/+2
| | | | | | | | | | | | not persist. Resolves http://opensimulator.org/mantis/view.php?id=5819
* | Merge branch 'master' into careminsterMelanie2012-02-161-5/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * In ObjectTortureTests, run garbage collector on Teardown and run scene loop ↵Justin Clark-Casey (justincc)2012-02-151-5/+5
| | | | | | | | | | | | | | | | | | | | | | update when scene objects have been deleted. At least on mono 2.6.4, running GC.Collect() is not guaranteed to force gc of all objects when run in the same method where those objects had references. Therefore, GC.Collect() is now being done in the per-script teardown of ObjectTortureTests. In addition, scene loop update is being run after garbage collection in order to clean out the viewer update list of scene objects in the SceneGraph. These measures mean that scene objects/parts are now garbage collected after a test run if deleted from the scene, resulting in a much better memory usage report (though probably still not very accurate). However, deletion takes a very long time - what's really needed is to find out now why the entire scene isn't being GC'd by this measure. This change hasn't yet been applied to the other stress tests.
* | Merge branch 'master' into careminsterMelanie2012-02-091-2/+11
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Stop a scene object from attempting to link with itself (which results in an ↵Justin Clark-Casey (justincc)2012-02-081-5/+11
| | | | | | | | | | | | exception and constant complaints in v3 viewers). Aims to address http://opensimulator.org/mantis/view.php?id=5878
* | Merge branch 'master' into careminsterMelanie2012-02-031-17/+2
|\ \ | |/
| * ObjectAddedToScene event should be fired when duplicating objectsDan Lake2012-02-021-16/+0
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-011-25/+20
| |\
| * | Add a version of GetGroupByPrim to Scene which accepts UUID instead of localIDDan Lake2012-01-191-1/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-311-1/+18
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * | Remove scene object null check on SceneGraph.AddSceneObject(). Complain ↵Justin Clark-Casey (justincc)2012-01-311-1/+7
| | | | | | | | | | | | | | | | | | explicitly if there's an attempt to add any object with a zero UUID. Callers themselves need to check that they're not attempting to add a null scene object.
| * | Add torture tests to test adding 10,000, 100,000 and 200,000 single prim ↵Justin Clark-Casey (justincc)2012-01-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | scene objects. These can be run using the "nant torture" target. They are not part of "nant test" due to their long-run future nature. Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc. However, data can be inconsistent due to different machine circumstances and virtual machine actions. This area is under development.
* | | Merge branch 'master' into careminsterMelanie2012-01-301-5/+7
|\ \ \ | |/ /
| * | lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if ↵Justin Clark-Casey (justincc)2012-01-301-5/+7
| | | | | | | | | | | | SceneObjectGroupsByFullID is updated elsewhere at the same time.
* | | Merge branch 'master' into careminsterMelanie2012-01-251-6/+0
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * | Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ↵Dan Lake2012-01-241-6/+0
| | | | | | | | | | | | ObjectCreateDelegate, ObjectDeleteDelegate
* | | Merge branch 'master' into careminsterMelanie2012-01-251-12/+0
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * | Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, ↵Dan Lake2012-01-241-13/+0
| |/ | | | | | | OnObjectDuplicate
* | Merge branch 'master' into careminsterMelanie2011-12-221-1/+0
|\ \ | |/
| * Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()Justin Clark-Casey (justincc)2011-12-221-1/+0
| |
* | Merge branch 'master' into careminsterMelanie2011-12-181-14/+0
|\ \ | |/
| * Fix bug where objects could not be set to a new group if the group had been ↵Justin Clark-Casey (justincc)2011-12-171-14/+0
| | | | | | | | | | | | | | | | | | | | created in that client session, or if no other action has been performed on the object. There were two problems here: 1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session 2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag. This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588 This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
| * Fix compile error from an earlier commitDan Lake2011-11-101-2/+0
| |
| * Prevent linking objects while they are deeded. On unlinking deeded objects,Melanie2011-11-111-4/+19
| | | | | | | | | | set LastOwnerID properly so the parts cannot be transferred, circumventing no trans perms
| * Replacing te linking code with the code from Avination. Link sets prims are nowMelanie2011-11-051-1/+1
| | | | | | | | numbered properly even when sets are linked to sets.
* | Prevent linking objects while they are deeded. On unlinking deeded objects,Melanie2011-11-101-4/+17
| | | | | | | | | | set LastOwnerID properly so the parts cannot be transferred, circumventing no trans perms
* | Merge branch 'master' into bigmergeMelanie2011-11-041-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the 3 iteration functions so more of them are using the correct iteration for the action they are performing. The 3 iterators that seem to fit all actions within OpenSim at this time are: ForEachAvatar: Perform an action on all avatars (root presences) ForEachClient: Perform an action on all clients (root or child clients) ForEachRootClient: Perform an action on all clients that have an avatar There are still a dozen places or so calling the old ForEachScenePresence that will take a little more refactoring to eliminate.
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-021-2/+2
|\ \
| * \ Merge branch 'master' into bigmergeMelanie2011-11-031-2/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on SOP consistently now. Also started working toward eliminating those calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule from outside SOP in favor of just setting properties on SOP and let SOP decide if an update should be scheduled. This consolidates the update policy within SOP and the client rather than everywhere that makes changes to SOP. Some places forget to call update while others call it multiple times, "just to be sure". UpdateFlag and Schedule*Update will both be made private shortly. UpdateFlag is intended to be transient and internal to SOP so it has been removed from XML serializer for SOPs.
* | | Fix link order when linking sets to setsMelanie2011-11-021-1/+7
|/ /
* | Merge branch 'master' into bigmergeMelanie2011-10-301-22/+16
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Remove the SyncRoot locking from Scene which was only being done around the ↵Justin Clark-Casey (justincc)2011-10-291-22/+16
| | | | | | | | | | | | main physics loop and ScenePresence position and velocity setting This is no longer necessary with ODECharacter taints (ODEPrim was already not taking part in this). BSCharacter was already tainting.
* | Merge branch 'master' into bigmergeMelanie2011-10-271-1/+15
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Added new ForEachRootScenePresence to Scene since almost every delegate ↵Dan Lake2011-10-271-1/+15
| | | | | | | | passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
* | Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmergeMelanie2011-10-121-0/+6
|\ \ | |/
| * Instead of adding stat agentMS in all kinds of places, calculate it instead ↵Justin Clark-Casey (justincc)2011-10-061-0/+6
| | | | | | | | | | | | | | | | in the main Scene.Update() loop, like the other stats Some of the places where agentMS was added were in separate threads launched by the update loop. I don't believe this is correct, since such threads are no longer contributing to frame time. Some of the places were also driven by client input rather than the scene loop. I don't believe it's appropriate to add this kind of stuff to scene loop stats. These changes hopefully have the nice affect of making the broken out frame stats actually add up to the total frame time
* | Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmergeMelanie2011-10-121-0/+5
|\ \ | |/
| * Make reported sim fps more accurate, in line with frame time msJustin Clark-Casey (justincc)2011-10-051-0/+5
| | | | | | | | Also remove some unused fields and improve naming on others.
* | Bring us up to date.Tom2011-09-141-18/+36
|\ \ | |/
| * Stop attempts to rewear already worn items from removing and reattaching.Justin Clark-Casey (justincc)2011-09-131-2/+2
| | | | | | | | | | | | | | | | Viewer 2/3 will sometimes attempt to rewear attachments, even though they have already been attached during the main login process. This change ignores those attempts. This stops script failures during login, as the rewearing was racing with the script startup code. It might also help with attachments being abnormally put into deleted state. Hopefully resolves some more of http://opensimulator.org/mantis/view.php?id=5644
| * Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID ↵Justin Clark-Casey (justincc)2011-09-131-2/+23
| | | | | | | | | | | | | | | | | | itemID) for now As far as I can see, this is only invoked by a PUT request to ObjectHandlers, which is not being used anyway. Invoking attachments code at this point is probably inappropriate since it would still be invoked when the client entered the scene. Being commented to simplify analysis of attachments issues. Can be uncommented when in use. Also, small tweak to lock and log removal of a SOG from the SceneObjectGroupsByLocalPartID collection in SceneGraph.GetGroupByPrim() if an inconsistency is found.
| * stop the duplicate remove of the root part ids from the full part and local ↵Justin Clark-Casey (justincc)2011-09-131-2/+0
| | | | | | | | | | | | part indexes in SG.DeleteSceneObject() this is unnecessary because the parts array iterated through contains the root part as well as the non-root parts
| * In SG.AddSceneObject(), stop unnecessarily adding the root part to object ↵Justin Clark-Casey (justincc)2011-09-131-7/+5
| | | | | | | | | | | | indexes sepearately from the other parts. The SOG.Parts property contains the root part as well as the non-root parts
| * stop the redundant passing in of RegionInfo to SceneGraph, since the Scene ↵Justin Clark-Casey (justincc)2011-09-121-5/+2
| | | | | | | | is always passed in at the same time.
| * minor: if the script engine fails to find a prim for a script, also print ↵Justin Clark-Casey (justincc)2011-09-121-0/+4
| | | | | | | | out that prim's local id in the error message.
* | First set of merge fixesTom2011-09-071-8/+7
| |
* | Resolve merge commits, stage 1Tom2011-09-041-42/+50
|\ \ | |/
generated by cgit v1.1 at 2024-11-17 11:42:24 +0000