| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-07-16 | 1 | -143/+183 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | update PrimMesher.cs to dll version r72 which fixes some path errors in ↵ | dahlia | 2012-07-13 | 1 | -143/+183 |
| | | | | | | | | | sliced linear prims. Addresses Mantis #6085 | ||||
| * | | Merge branch 'avination' into careminster | Melanie | 2012-07-11 | 5 | -62/+140 |
| |\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs | ||||
| | * | | ubitODE leaks | UbitUmarov | 2012-07-11 | 3 | -25/+33 |
| | | | | |||||
| | * | | let rotationVelocity or AngularVelocity be setted on prims. Limited to | UbitUmarov | 2012-07-10 | 1 | -19/+46 |
| | | | | | | | | | | | | | 12rad/s | ||||
| | * | | retry fixing ode getconfiguration() | UbitUmarov | 2012-07-09 | 1 | -1/+8 |
| | | | | |||||
| | * | | fix ode getconfiguration | UbitUmarov | 2012-07-09 | 2 | -2/+2 |
| | | | | |||||
| | * | | log ODE lib configuration | UbitUmarov | 2012-07-09 | 1 | -3/+7 |
| | | | | |||||
| | * | | fix ODE dispose plus minor clean. On regions restart ode.dispose seems | UbitUmarov | 2012-07-09 | 1 | -15/+43 |
| | | | | | | | | | | | | | | | | to be called with scene still calling simulation, that should be changed, for now added a check for a valid world in ode simulation | ||||
| | * | | ODE turn off material dependent friction while vehicle linear motor is ↵ | UbitUmarov | 2012-07-07 | 3 | -5/+9 |
| | | | | | | | | | | | | | Effective. Increase a bit world damping of velocities | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 4 | -58/+107 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Clean up collision reporting code so they are properly passed to | Robert Adams | 2012-07-06 | 4 | -58/+107 |
| | | | | | | | | | | | | | | | | the simulator in batches. More comments. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-07-06 | 1 | -11/+38 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | ubitode: create and use 4 off world collision spaces for offworld static prims | UbitUmarov | 2012-06-30 | 1 | -11/+38 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-07-01 | 1 | -2/+3 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-06-30 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-29 | 2 | -16/+16 |
| |\ \ \ | |/ / | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | Move update of the final optional ODE total frame stat inside the OdeLock ↵ | Justin Clark-Casey (justincc) | 2012-06-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | rather than outside to avoid a very occasional race condition with the stat collection thread | ||||
| | * | | refactor: rename _collisionEventPrim to m_collisionEventActors and ↵ | Justin Clark-Casey (justincc) | 2012-06-29 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | _collisionEventPrimChanges to m_collisionEventActorsChanges to reflect their actual contents. These dictionaries handle all actor types, not just physical prims. | ||||
| | * | | Fix a regression where we stopped removing avatars from collision event ↵ | Justin Clark-Casey (justincc) | 2012-06-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | reporting on logout, rather than stopping clearing their collision events. This occurred in b18c8c8 (Thu May 17 2012). This was a cause of very occasional race conditions and likely memory leakage as clients came and went from the region. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-06-06 | 1 | -3/+3 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | fix addforce/impulse. | UbitUmarov | 2012-06-04 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-02 | 1 | -60/+256 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | ||||
| | * | | Add optional total avatars, total prims and active prims stats to ODE plugin. | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | These will act as a sanity check with the main scene stats, to show that physics scene entities are being managed properly. Total prims will not match scene total prims since physics total does not include phantom prims | ||||
| | * | | If OdeScene.Near() returns no collision contacts, then exit as early as ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -0/+4 |
| | | | | | | | | | | | | | possible. All subsequent code is only relevant if there are contacts. | ||||
| | * | | Add optional stat for the other collision time per frame not spent in ODE ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -1/+16 |
| | | | | | | | | | | | | | native spaces or geom collision code | ||||
| | * | | Add avatar forces calculation, prim force and raycasting per frame ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+46 |
| | | | | | | | | | | | | | millisecond optional stats | ||||
| | * | | Collection optional avatar and prim taint frame millisecond times | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+36 |
| | | | | |||||
| | * | | Remove recent optional native collision frame milliseconds stat | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -13/+1 |
| | | | | | | | | | | | | | Unnecessary since this has now been broken down into space collisions and geom collisions | ||||
| | * | | Add optional stat that records milliseconds spent notifying collision ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -0/+14 |
| | | | | | | | | | | | | | listeners in physics frames | ||||
| | * | | Add avatar and prim update milliseconds per frame optional stats | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+31 |
| | | | | |||||
| | * | | Add option native step frame ms stat | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -9/+21 |
| | | | | |||||
| | * | | Add total ODE frame time optional stat, as a sanity check on the main scene ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -7/+21 |
| | | | | | | | | | | | | | physics stat | ||||
| | * | | Break down native ODE collision frame time stat into native space collision ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -4/+22 |
| | | | | | | | | | | | | | and geom collision stats | ||||
| | * | | Rename new collision stats to 'contacts' - there are/can be multiple ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -6/+6 |
| | | | | | | | | | | | | | contacts per collision and this is what is actually being measured. | ||||
| | * | | Stop adding an unnecessary duplicate _perloopcontact if the avatar is ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -9/+4 |
| | | | | | | | | | | | | | | | | | | | standing on a prim. This has already been added earlier on in the method. | ||||
| | * | | minor: comment out currently unused OdeScene.sCollisionData | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -9/+9 |
| | | | | |||||
| | * | | Add ODE avatar and prim collision numbers if extra stats collection is enabled. | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -5/+34 |
| | | | | |||||
| | * | | Fix OdeScene.GetTopColliders() to return the top 25 colliders rather than ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 1 | -19/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-05-31 | 2 | -4/+10 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | ubitode prim: if makebody() is called already having a body, do a full ↵ | UbitUmarov | 2012-05-30 | 1 | -3/+4 |
| | | | | | | | | | | | | | destrution so there are no 'leaks'. | ||||
| | * | | Guard setting the building flag | Melanie | 2012-05-30 | 1 | -0/+4 |
| | | | | |||||
| | * | | Whitespace fix | Melanie | 2012-05-30 | 1 | -1/+1 |
| | | | | |||||
| | * | | fix physics not reporting collisions only with terrain | UbitUmarov | 2012-05-29 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-31 | 2 | -10/+143 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Add an optional mechanism for physics modules to collect and return ↵ | Justin Clark-Casey (justincc) | 2012-05-31 | 2 | -10/+143 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Merge branch 'avination' | Melanie | 2012-05-29 | 4 | -70/+134 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | fix avatars collisions on sim crossings and other few cases where ↵ | UbitUmarov | 2012-05-28 | 1 | -2/+1 |
| | | | | | | | | | | | | | freemove() is called | ||||
| | * | | a bit cleaner code (?) on sculpts/meshs meshing checking | UbitUmarov | 2012-05-28 | 1 | -7/+6 |
| | | | | |||||
| | * | | let meshs work indenpendently of mesh_sculpted_prim config option | UbitUmarov | 2012-05-28 | 1 | -29/+25 |
| | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |