| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-03 | 4 | -78/+83 | |
| |\ \ \ | |/ / | ||||||
| | * | | Fix build break whree accidentally did inv.Folders rather than ↵ | Justin Clark-Casey (justincc) | 2012-06-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | inv.Folders.Count in a minor change. | |||||
| | * | | minor: tidy up some comments | Justin Clark-Casey (justincc) | 2012-06-02 | 1 | -4/+2 | |
| | | | | ||||||
| | * | | Fix various issues with http inventory | Justin Clark-Casey (justincc) | 2012-06-02 | 4 | -78/+85 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 1) The return messages were being wrongly populated with the names of asset, inventory and sale types when their corresponding integers should have been used instead. 2) Folders with links were including the linked items in the descendents figure, when only the links should be included. 3) Links and linked items in link folders were not being included in the return data, and not in the correct order. Now that these issues have been addressed, outfits and attachments appear to work consistently when HTTP inventory is enabled (as is now the default). | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-06-02 | 4 | -34/+63 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | Fix LSL animation state reporting and animation state transitions on crossing | Melanie | 2012-06-01 | 2 | -8/+34 | |
| | | | | ||||||
| | * | | Fix impersonation, it got broken in a merge | Melanie | 2012-06-01 | 1 | -7/+10 | |
| | | | | ||||||
| | * | | Remove the kill record. Core has removed it long ago and it really does more ↵ | Melanie | 2012-06-01 | 1 | -19/+19 | |
| | | | | | | | | | | | | | harm than good these days | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-06-02 | 3 | -93/+270 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs | |||||
| | * | | Instead of updating sim stats root agent, child, objects and scripts ↵ | Justin Clark-Casey (justincc) | 2012-06-01 | 2 | -33/+14 | |
| | | | | | | | | | | | | | accounts every single scene frame, update in the once every 3 seconds SimStatsReporter run | |||||
| | * | | 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 | 7 | -209/+236 | |
| |\ \ \ | | |/ | |/| | | | | | | | 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 | |
| | | | | ||||||
| | * | | Prevent multiple requests to go physical from reaching the physics plugin | Melanie | 2012-05-30 | 1 | -0/+4 | |
| | | | | ||||||
| | * | | Fix the log standing attach-from-world bug. | Melanie | 2012-05-30 | 2 | -42/+59 | |
| | | | | ||||||
| | * | | fix physics not reporting collisions only with terrain | UbitUmarov | 2012-05-29 | 1 | -0/+1 | |
| | | | | ||||||
| | * | | Add advanced collision processing into ScenePresence | Melanie | 2012-05-29 | 1 | -162/+162 | |
| | | | | ||||||
| | * | | Fix collision filtering | Melanie | 2012-05-29 | 1 | -10/+10 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-31 | 7 | -69/+450 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Add an optional mechanism for physics modules to collect and return ↵ | Justin Clark-Casey (justincc) | 2012-05-31 | 5 | -60/+252 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | Add console command "teleport user" to allow teleport from the region console | Justin Clark-Casey (justincc) | 2012-05-29 | 1 | -0/+189 | |
| | | | | | | | | | | | | | See "help teleport user" on the console for more details | |||||
| | * | | Fix collision filtering. The filter should be checked on the receiving part! | Melanie | 2012-05-29 | 1 | -9/+9 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-29 | 3 | -238/+332 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||||
| | * | | refactor: factor out entity transfer state machine into a separate class to ↵ | Justin Clark-Casey (justincc) | 2012-05-28 | 3 | -239/+330 | |
| | | | | | | | | | | | | | make code more analyzable | |||||
| | * | | If handling the failure of teleport, move agent state to CleaningUp when we ↵ | Justin Clark-Casey (justincc) | 2012-05-28 | 1 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | Re-add script collisions that were lost in a merge | Melanie | 2012-05-29 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Merge branch 'avination' | Melanie | 2012-05-29 | 7 | -252/+245 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | 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 | |
| | | | | ||||||
| | * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-05-28 | 2 | -180/+103 | |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/CollisionSounds.cs | |||||
| | | * | | Place the return back into collision sounds. | Melanie | 2012-05-28 | 1 | -0/+4 | |
| | | | | | ||||||
| | | * | | If a region is not found on a simulator, make the health query return | Melanie | 2012-05-28 | 1 | -4/+13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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, | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |