aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-06-023-27/+53
|\
| * Fix LSL animation state reporting and animation state transitions on crossingMelanie2012-06-012-8/+34
| * Remove the kill record. Core has removed it long ago and it really does more ...Melanie2012-06-011-19/+19
* | Merge branch 'master' into careminsterMelanie2012-06-023-93/+270
|\ \
| * | Instead of updating sim stats root agent, child, objects and scripts accounts...Justin Clark-Casey (justincc)2012-06-012-33/+14
| * | Add optional total avatars, total prims and active prims stats to ODE plugin.Justin Clark-Casey (justincc)2012-06-011-0/+21
| * | If OdeScene.Near() returns no collision contacts, then exit as early as possi...Justin Clark-Casey (justincc)2012-06-011-0/+4
| * | Add optional stat for the other collision time per frame not spent in ODE nat...Justin Clark-Casey (justincc)2012-06-011-1/+16
| * | Add avatar forces calculation, prim force and raycasting per frame millisecon...Justin Clark-Casey (justincc)2012-06-011-7/+46
| * | Collection optional avatar and prim taint frame millisecond timesJustin Clark-Casey (justincc)2012-06-011-7/+36
| * | Remove recent optional native collision frame milliseconds statJustin Clark-Casey (justincc)2012-06-011-13/+1
| * | Add optional stat that records milliseconds spent notifying collision listene...Justin Clark-Casey (justincc)2012-06-011-0/+14
| * | Add avatar and prim update milliseconds per frame optional statsJustin Clark-Casey (justincc)2012-06-011-7/+31
| * | Add option native step frame ms statJustin Clark-Casey (justincc)2012-06-011-9/+21
| * | Add total ODE frame time optional stat, as a sanity check on the main scene p...Justin Clark-Casey (justincc)2012-06-011-7/+21
| * | Break down native ODE collision frame time stat into native space collision a...Justin Clark-Casey (justincc)2012-06-011-4/+22
| * | Rename new collision stats to 'contacts' - there are/can be multiple contacts...Justin Clark-Casey (justincc)2012-06-011-6/+6
| * | Stop adding an unnecessary duplicate _perloopcontact if the avatar is standin...Justin Clark-Casey (justincc)2012-06-011-9/+4
| * | minor: comment out currently unused OdeScene.sCollisionDataJustin Clark-Casey (justincc)2012-06-011-9/+9
| * | Add ODE avatar and prim collision numbers if extra stats collection is enabled.Justin Clark-Casey (justincc)2012-06-011-5/+34
| * | Fix OdeScene.GetTopColliders() to return the top 25 colliders rather than the...Justin Clark-Casey (justincc)2012-06-011-19/+13
* | | Merge branch 'avination' into careminsterMelanie2012-05-317-209/+236
|\ \ \ | | |/ | |/|
| * | ubitode prim: if makebody() is called already having a body, do a full destru...UbitUmarov2012-05-301-3/+4
| * | Guard setting the building flagMelanie2012-05-301-0/+4
| * | Whitespace fixMelanie2012-05-301-1/+1
| * | Prevent multiple requests to go physical from reaching the physics pluginMelanie2012-05-301-0/+4
| * | Fix the log standing attach-from-world bug.Melanie2012-05-302-42/+59
| * | fix physics not reporting collisions only with terrainUbitUmarov2012-05-291-0/+1
| * | Add advanced collision processing into ScenePresenceMelanie2012-05-291-162/+162
| * | Fix collision filteringMelanie2012-05-291-10/+10
* | | Merge branch 'master' into careminsterMelanie2012-05-317-69/+450
|\ \ \ | | |/ | |/|
| * | Add an optional mechanism for physics modules to collect and return arbitrary...Justin Clark-Casey (justincc)2012-05-315-60/+252
| * | Add console command "teleport user" to allow teleport from the region consoleJustin Clark-Casey (justincc)2012-05-291-0/+189
| * | Fix collision filtering. The filter should be checked on the receiving part!Melanie2012-05-291-9/+9
* | | Merge branch 'master' into careminsterMelanie2012-05-293-238/+332
|\ \ \ | |/ /
| * | refactor: factor out entity transfer state machine into a separate class to m...Justin Clark-Casey (justincc)2012-05-283-239/+330
| * | If handling the failure of teleport, move agent state to CleaningUp when we s...Justin Clark-Casey (justincc)2012-05-281-3/+6
* | | Re-add script collisions that were lost in a mergeMelanie2012-05-291-0/+2
* | | Merge branch 'avination'Melanie2012-05-296-248/+232
|\ \ \ | | |/ | |/|
| * | fix avatars collisions on sim crossings and other few cases where freemove()...UbitUmarov2012-05-281-2/+1
| * | a bit cleaner code (?) on sculpts/meshs meshing checkingUbitUmarov2012-05-281-7/+6
| * | let meshs work indenpendently of mesh_sculpted_prim config optionUbitUmarov2012-05-281-29/+25
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-05-281-176/+90
| |\ \
| | * | Place the return back into collision sounds.Melanie2012-05-281-0/+4
| | * | Merge branch 'ubitwork' into avinationMelanie2012-05-284-38/+110
| | |\ \
| | * | | Modify SceneManeger to use a DoubleDictionary and work without locks.Melanie2012-05-281-176/+90
| * | | | disable collision sounds for nowUbitUmarov2012-05-281-2/+8
| * | | | revert making sculpts phanton if sculpt meshing option is offUbitUmarov2012-05-281-2/+0
| | |/ / | |/| |
| * | | Let OOB information usable outside ubitodeUbitUmarov2012-05-273-29/+33
| * | | also don't collide sculps or meshs if meshing is OFFUbitUmarov2012-05-211-0/+2