31343aa7c3
Add optional stat that records milliseconds spent notifying collision listeners in physics frames
2012-06-01 02:33:44 +01:00
5f44be99ef
Add avatar and prim update milliseconds per frame optional stats
2012-06-01 02:25:42 +01:00
5cc9b820e5
Add option native step frame ms stat
2012-06-01 01:58:28 +01:00
f2c8c7a7b8
Add total ODE frame time optional stat, as a sanity check on the main scene physics stat
2012-06-01 01:37:19 +01:00
8333b928fa
Break down native ODE collision frame time stat into native space collision and geom collision stats
2012-06-01 01:27:19 +01:00
c33c8db825
Rename new collision stats to 'contacts' - there are/can be multiple contacts per collision and this is what is actually being measured.
2012-06-01 01:15:27 +01:00
e1f8d2adb0
Stop adding an unnecessary duplicate _perloopcontact if the avatar is standing on a prim.
...
This has already been added earlier on in the method.
2012-06-01 01:12:30 +01:00
8301f7b17f
minor: comment out currently unused OdeScene.sCollisionData
2012-06-01 00:57:55 +01:00
93fa9e8991
Add ODE avatar and prim collision numbers if extra stats collection is enabled.
2012-06-01 00:56:13 +01:00
878b67b333
Fix OdeScene.GetTopColliders() to return the top 25 colliders rather than the first 25 that had non-zero collision scores.
...
Also zeros collisions scores on all prims after report collection, not just the top 25.
As before, this collision scores are only reset after a report is requested, which may give unrealistic numbers on the first request.
So to see more realistic scores, ignore the first report and then refresh the request after a couple of seconds or so.
2012-06-01 00:26:11 +01:00
4b3cb91ce8
Remove the kill record. Core has removed it long ago and it really does more harm than good these days
2012-06-01 00:12:04 +02:00
e696d1d952
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-31 03:37:43 +01:00
e80161753f
Merge branch 'master' into careminster
2012-05-31 03:35:24 +01:00
0b02a4d42e
Add an optional mechanism for physics modules to collect and return arbitrary stats.
...
If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule
(http://opensimulator.org/wiki/Monitoring_Module )
This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings].
This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing.
This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds.
The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code.
2012-05-31 01:52:26 +01:00
40c0f6a688
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-30 22:37:56 +02:00
cc903992dd
ubitode prim: if makebody() is called already having a body, do a full destrution so there are no 'leaks'.
2012-05-30 21:32:15 +01:00
c548f48791
Guard setting the building flag
2012-05-30 19:32:02 +02:00
0587079115
Whitespace fix
2012-05-30 19:25:52 +02:00
86f786d673
Prevent multiple requests to go physical from reaching the physics plugin
2012-05-30 16:10:01 +02:00
4358bb8f85
Fix the log standing attach-from-world bug.
2012-05-30 00:50:47 +02:00
bf0b8170f7
Add console command "teleport user" to allow teleport from the region console
...
See "help teleport user" on the console for more details
2012-05-29 23:35:20 +01:00
927e026b6d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-29 20:14:39 +02:00
3e9a831e87
fix physics not reporting collisions only with terrain
2012-05-29 19:13:27 +01:00
b660c4991b
Fix collision filtering. The filter should be checked on the receiving part!
2012-05-29 18:18:47 +01:00
997d23c590
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2012-05-29 18:12:18 +01:00
100d2968c4
Add advanced collision processing into ScenePresence
2012-05-29 17:24:17 +02:00
c46b31a9b4
Re-add script collisions that were lost in a merge
2012-05-29 16:58:08 +02:00
10e9ad0086
Fix collision filtering
2012-05-29 16:56:04 +02:00
9129a0cce4
Merge branch 'avination'
2012-05-29 08:45:44 +02:00
79f3ce2e9f
refactor: factor out entity transfer state machine into a separate class to make code more analyzable
2012-05-28 23:06:00 +01:00
4f08dae24b
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-28 23:25:51 +02:00
dbbfe0cdd7
fix avatars collisions on sim crossings and other few cases where freemove() is called
2012-05-28 22:23:32 +01:00
8f87f55d05
If handling the failure of teleport, move agent state to CleaningUp when we start the handling.
...
Also fixes the log warning from ResetInTransit() if the state is cleared direct from Transferring or ReceiveAtDestination, as pointed out in mantis 5426
2012-05-28 22:16:06 +01:00
2122c336b0
a bit cleaner code (?) on sculpts/meshs meshing checking
2012-05-28 14:44:06 +01:00
60cebe9a5b
let meshs work indenpendently of mesh_sculpted_prim config option
2012-05-28 14:32:16 +01:00
657dbb51af
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-05-28 14:17:28 +02:00
5141f4075f
Merge branch 'avination' into ubitwork
...
Conflicts:
OpenSim/Region/Framework/Scenes/CollisionSounds.cs
2012-05-28 13:13:01 +01:00
121433d03a
disable collision sounds for now
2012-05-28 13:10:02 +01:00
20baa6334c
revert making sculpts phanton if sculpt meshing option is off
2012-05-28 13:05:50 +01:00
b70fb7df78
Place the return back into collision sounds.
2012-05-28 11:28:46 +02:00
ca3b229e94
If a region is not found on a simulator, make the health query return
...
0 to indicate it's still starting rather than an error. There are other
methods that can discover the presence of a region and slow starting regions
may cause the watchdog to kill them while they start,
2012-05-28 09:15:24 +02:00
c5e73c0cb8
Merge branch 'ubitwork' into avination
2012-05-28 02:19:29 +02:00
bbaf450c30
Modify SceneManeger to use a DoubleDictionary and work without locks.
...
Changes to the scenes dictionary are exceedingly rare and using atomic
operations makes the chance of collisions nearly nil in any case.
2012-05-28 02:14:14 +02:00
78e657fd8d
Merge branch 'avination' into careminster
2012-05-27 19:35:36 +01:00
884c0e7bb1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-05-27 19:24:30 +01:00
f740c9522a
Let OOB information usable outside ubitode
2012-05-27 14:01:42 +01:00
7fd38788b4
minor: code formatting from 0b72f773
2012-05-26 02:14:32 +01:00
0b72f773c7
Mantis 6025 llRequestPermissions auto grant for NPCs.
...
If the script requesting permissions is owned by either the NPC or
the NPCs owner (if the NPC is created as owned) then grant any
permissions automatically.
2012-05-26 02:09:22 +01:00
43a6f28620
If restating a region, clean up the physics scene after the main scene has been closed not before.
...
If this is done before then on ODE agent update calls still incoming can fail as they try to use a raycastmanager that has been disposed.
Bullet plugin does nothing on Dispose()
However, I wouldn't be at all surprised if individual region restarting was buggy in lots of other areas.
2012-05-26 01:55:35 +01:00
3ac3be99ae
Add Blake/Techplex to CONTRIBUTORS. Thanks!
2012-05-26 01:35:33 +01:00
Justin Clark-Casey (justincc)