aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-051-2/+10
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Fix NPC sitting for prims without a sit target.Justin Clark-Casey (justincc)2011-11-051-2/+10
| | | | | | | | | | | | | | | | This is to partially address http://opensimulator.org/mantis/view.php?id=5769 We don't need to call SP.HandleAgentSit() again if we are within 10m since the autopilot won't trigger. By calling it twice, the position of the sitting NPC was wrongly adjusted, ending up near <0,0,0>. However, this change does mean that NPCs further than 10m away will not attempt to autopilot to the prim, though this code was broken anyway (is actually a different mechanism to normal NPC movmeent). Hopefully this can be addressed soon.
* | Merge branch 'master' into bigmergeMelanie2011-11-041-9/+9
|\ \ | |/ | | | | | | | | | | | | 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-4/+4
| | | | | | | | | | | | 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-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'master' into bigmergeMelanie2011-11-031-54/+53
|\ \ | |/ | | | | | | | | | | | | 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-50/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into bigmergeMelanie2011-10-301-5/+20
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-281-6/+3
| |\
| * | fetch SOP.RotationOffset once in UpdateRotation() and compare rather than ↵Justin Clark-Casey (justincc)2011-10-281-5/+20
| | | | | | | | | | | | | | | | | | fetch four separate times. No functional change.
* | | Merge branch 'master' into bigmergeMelanie2011-10-271-6/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 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
| * | Continuation of previous checkin. Found more places where ↵Dan Lake2011-10-271-6/+3
| |/ | | | | | | ForEachScenePresence can be changed to ForEachRootScenePresence.
| * Fix a bug I introduced yesterday in ODE physics where prim scripts would ↵Justin Clark-Casey (justincc)2011-10-271-0/+2
| | | | | | | | only receive the very first collision.
* | Merge branch 'master' into bigmergeMelanie2011-10-261-8/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| * Get rid of the pointless null checks on collision listeners. Add warning ↵Justin Clark-Casey (justincc)2011-10-251-4/+0
| | | | | | | | about synchronicity for PhysicsActor.OnCollisionUpdate event doc
| * For ScenePresence collision events, instead of creating a new ↵Justin Clark-Casey (justincc)2011-10-251-4/+6
| | | | | | | | | | | | CollisionEventsThisFrame every time we need to send some new ones, reuse the existing one instead. This assumes that the listener is using the data synchronously, which is currently the case.
* | Merge commit '62a63f834b7cc056ee37c396034d0e268f66b4a8' into bigmergeMelanie2011-10-251-5/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * refactor: Use SOP.SitTargetAvatar instead of calling a special ↵Justin Clark-Casey (justincc)2011-10-171-5/+3
| | | | | | | | GetAvatarOnSitTarget() which returned exactly the same thing
* | Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmergeMelanie2011-10-251-3/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Implement osNpcSit(). This is still in development so don't trust itJustin Clark-Casey (justincc)2011-10-171-2/+0
| | | | | | | | | | | | | | | | | | Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE) e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE); At the moment, sit only succeeds if the part has a sit target set. NPC immediately sits on the target even if miles away - they do not walk up to it. This method is in development - it may change so please don't trust it yet. Standing will follow shortly since that's kind of important once you're sitting :)
* | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmergeMelanie2011-10-251-33/+8
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * fetch physical_prim switch from [Startup] config from inside scene, as is ↵Justin Clark-Casey (justincc)2011-10-151-34/+8
| | | | | | | | done for most other scene config params
* | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * remove now redundant m_physical_prim flag from SOP.ApplyPhysics()Justin Clark-Casey (justincc)2011-10-151-4/+4
| |
* | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmergeMelanie2011-10-251-1/+6
|\ \ | |/
| * Restore [Startup] physical_prim flag which can stop any prims being subject ↵Justin Clark-Casey (justincc)2011-10-151-1/+6
| | | | | | | | | | | | | | to physics This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed. Default for this flag is true as previously.
* | Merge commit 'f2889d7ce97a01086dc7fc0690865a1eae452364' into bigmergeMelanie2011-10-251-4/+0
|\ \ | |/
| * remove redundant PhysActor.IsPhysical call from SOP.UpdatePrimFlags() as its ↵Justin Clark-Casey (justincc)2011-10-151-4/+0
| | | | | | | | done immediately afterwards in DoPhysicsPropertyUpdate()
* | Merge commit '732e9373795a35ed1965bbb93a02117fcf0a8c3e' into bigmergeMelanie2011-10-251-27/+21
|\ \ | |/
| * refactor: Remove redundant code in SOP.UpdatePrimFlags()Justin Clark-Casey (justincc)2011-10-151-27/+21
| |
* | Merge commit 'c93c9ea072f319125f466c913f5f4fe1f6864045' into bigmergeMelanie2011-10-251-5/+17
|\ \ | |/
| * factor common code out into SOP.RemoveFromPhysics()Justin Clark-Casey (justincc)2011-10-151-5/+17
| |
* | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it ↵Justin Clark-Casey (justincc)2011-10-141-2/+2
| | | | | | | | sends entity updates (including presence ones), not just prims.
* | Merge branch 'master' into bigmergeMelanie2011-10-121-1/+7
|\ \ | |/
| * Start recording object updates per second statistic (analogue of agent ↵Justin Clark-Casey (justincc)2011-10-111-1/+7
| | | | | | | | | | | | updates per secod) and expose via monitoring module as ObjectUpdatePerSecondMonitor A useful diagnostic to find out how object updates are burdening a scene
* | Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmergeMelanie2011-10-111-4/+0
|\ \ | |/
| * Remove unimplementated UpdateMovement() methods from SOG, SOP.Justin Clark-Casey (justincc)2011-10-011-4/+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-1/+6
|\ \ | |/ | | | | | | 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/+6
| | | | | | | | are only sent to affected clients.
* | Merge commit 'bec0cbe82b0de1b5fa8e214a0cc59d0db1f25959' into bigmergeMelanie2011-10-111-14/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * remove unused SOP.Create() methodJustin Clark-Casey (justincc)2011-09-231-14/+0
| |
* | Merge commit 'b2356340d22578143af2daab979ea4633faa93dc' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
* | Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmergeMelanie2011-10-111-14/+26
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to ↵Justin Clark-Casey (justincc)2011-09-151-14/+18
| | | | | | | | | | | | reflect what it actually does This also makes it consistent with some other methods that send data to the client.
* | Merge fixes, and fix the buildTom2011-09-141-0/+8
| |
* | First set of merge fixesTom2011-09-071-37/+26
| |
* | Resolve merge commits, stage 1Tom2011-09-041-455/+497
|\ \ | |/
| * stop passing FromUserInventoryItemID right down into the deserializer.Justin Clark-Casey (justincc)2011-09-021-13/+2
| | | | | | | | the code becomes simpler if this is set from the outside - only one place needs to do this.
| * Move more of IAM.RezObject() into DoPreRezWhenFromItem()Justin Clark-Casey (justincc)2011-09-021-3/+2
| |
generated by cgit v1.1 at 2024-12-19 20:59:21 +0000