aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Prevent spurious "CHANGED_POSITION" during region backupMelanie2012-01-051-3/+4
|
* Merge branch 'master' into careminsterMelanie2011-12-231-1/+1
|\
| * fix the UsesPhysics flag to reference the physics flag rather than the ↵Mic Bowman2011-12-221-1/+1
| | | | | | | | temponrez flag
* | Merge branch 'master' into careminsterMelanie2011-12-221-3/+2
|\ \ | |/
| * Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()Justin Clark-Casey (justincc)2011-12-221-3/+2
| |
* | Merge branch 'master' into careminsterMelanie2011-12-181-7/+14
|\ \ | |/
| * Fix bug where objects could not be set to a new group if the group had been ↵Justin Clark-Casey (justincc)2011-12-171-0/+2
| | | | | | | | | | | | | | | | | | | | 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
| * refactor: simplify methods in Scene.PacketHandlers.cs by using ↵Justin Clark-Casey (justincc)2011-12-171-4/+10
| | | | | | | | GetGroupByPrim() rather than retrieving GetEntities() and inspecting the entire list
| * Stop generating client flags when we send out full object updates.Justin Clark-Casey (justincc)2011-12-161-3/+2
| | | | | | | | These were entirely unused.
* | Fix hit testing link sets properly. Fix raycasting for LSL.Melanie2011-12-171-6/+6
| |
* | Merge branch 'master' into careminsterMelanie2011-12-141-0/+2
|\ \ | |/
| * Just adding a comment to SendFullUpdatToClientDan Lake2011-12-131-0/+2
| |
* | Fix phantom and temp flags not takingMelanie2011-12-061-2/+2
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-141-24/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneViewer.cs
| * Remove SceneViewer from ScenePresence to reduce quadruple queueing ofDan Lake2011-11-111-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | prim update to only triple queuing. Existing method was: 1. Schedule prim for update, adding to scene update list 2. Update on SOGs during heartbeat queues update onto each SceneViewer 3. Update on SPs during heartbeat queues update onto each IClientAPI 4. ProcessEntityUpdates queues updates into UDP send stack Now the SceneViewer has been eliminated so updates are scheduled at any time and then put onto the IClientAPI priority queues immediately during SceneGraph.UpdateObjectGroups.
* | Merge branch 'master' into bigmergeMelanie2011-11-101-1/+6
|\ \ | |/
| * Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant ↵Dan Lake2011-11-101-1/+6
| | | | | | | | properties packet sends and so one part is not telling a different part what to do. That should be up to the SOG to manage permissions on its parts and notify clients when one of them changes.
* | Merge branch 'master' into bigmergeMelanie2011-11-101-10/+15
|\ \ | |/
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-101-1/+1
| |\
| * | When updating SOG, a physics taint should not override a full update with a ↵Dan Lake2011-11-101-10/+15
| | | | | | | | | | | | terse update
* | | Merge branch 'master' into bigmergeMelanie2011-11-101-1/+1
|\ \ \ | | |/ | |/|
| * | minor: Correct misleading method doc on SOG.UpdateRootRotation()Justin Clark-Casey (justincc)2011-11-091-1/+1
| |/
* | Merge branch 'master' into bigmergeMelanie2011-11-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-061-1/+1
| | | | | | | | packet per prim. More to come as we change to make use of this.
* | Merge branch 'master' into bigmergeMelanie2011-11-051-1/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Don't rotate child prims, if only the root prim is rotated.nebadon2011-11-051-2/+2
| |
| * Replacing te linking code with the code from Avination. Link sets prims are nowMelanie2011-11-051-35/+11
| | | | | | | | numbered properly even when sets are linked to sets.
* | 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
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-031-1/+1
| | | | | | | | | | | | from previous commit which sort out which iterator is used are left intact. A discussion is needed as to what constitutes an avatar vs a ScenePresence.
| * 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-4/+4
|\ \
| * \ Merge branch 'master' into bigmergeMelanie2011-11-031-4/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | 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-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-39/+11
|/ /
* | Merge branch 'master' into bigmergeMelanie2011-10-301-19/+14
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Remove completely unused SOG.Rotation parameterJustin Clark-Casey (justincc)2011-10-291-8/+0
| | | | | | | | We always use SOP.Rotation instead
| * set grp.RootPart.GroupPosition for code consistency (and readability) rather ↵Justin Clark-Casey (justincc)2011-10-281-5/+0
| | | | | | | | than calling SOP.OffsetForNewRegion
| * Add missing doc to rotation/position methods in SOGJustin Clark-Casey (justincc)2011-10-281-5/+5
| |
* | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | MergeMelanie2011-10-251-1/+1
| |
* | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * remove now redundant m_physical_prim flag from SOP.ApplyPhysics()Justin Clark-Casey (justincc)2011-10-151-2/+2
| |
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-121-20/+17
|\ \
| * \ Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmergeMelanie2011-10-111-7/+0
| |\ \ | | |/
| | * Remove unimplementated UpdateMovement() methods from SOG, SOP.Justin Clark-Casey (justincc)2011-10-011-7/+0
| | | | | | | | | | | | | | | SP still has an implementation but this is now just a public method on SP rather than an abstract one in EntityBase. No point making the code more complex until it actually needs to be,
| * | Merge commit '2b2580e3a12d5c493f9a77bf9435ca32a0a0355c' into bigmergeMelanie2011-10-111-0/+8
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * Fix for rezzing and derezzing HUDs (see Mantis #5406). From now on updates ↵Snoopy Pfeffer2011-09-251-1/+5
| | | | | | | | | | | | are only sent to affected clients.
| * | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmergeMelanie2011-10-111-1/+1
| |\ \ | | |/
| | * Reinstate option to land an npc when it reaches a target.Justin Clark-Casey (justincc)2011-09-221-1/+1
| | | | | | | | | | | | This is moved into ScenePresence for now as a general facility
| * | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-111-12/+8
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs