aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Remove two causes of recursive locking. Merge artefact cleanup.Melanie2012-06-061-7/+5
* Reverse the logic of a conditional. Clears up a merge artefact.Melanie2012-06-061-1/+1
* Fix not sending TransferInfo when an asset is not found. This clogsMelanie2012-06-061-4/+29
* Merge branch 'avination' into careminsterMelanie2012-06-068-29/+57
|\
| * fix the real cause of double velocityUbitUmarov2012-06-051-1/+0
| * revert last bad commit but fix recoil directionUbitUmarov2012-06-051-4/+4
| * Stop llRezAtRoot() from applying velocity setting impulse in World.RezObject...UbitUmarov2012-06-051-2/+3
| * Fix land collisions to work like SL.Melanie2012-06-051-6/+16
| * Actually trigger land collisions in the root even when a child collidesMelanie2012-06-041-1/+1
| * Merge branch 'ubitwork' into avinationMelanie2012-06-041-3/+3
| |\
| | * fix addforce/impulse.UbitUmarov2012-06-041-3/+3
| * | Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach posi...Melanie2012-06-045-9/+27
| |/
* | Merge branch 'master' into careminsterMelanie2012-06-0614-435/+510
|\ \
| * | minor: Change log messages on Warp3DImageModule to show they are from this mo...Justin Clark-Casey (justincc)2012-06-061-7/+9
| * | Rename MapImageModule for Warp3D to Warp3DImageModule to match its class name...Justin Clark-Casey (justincc)2012-06-061-0/+0
| * | Actively dispose of Bitmaps in Warp3D image module and world map module once ...Justin Clark-Casey (justincc)2012-06-063-215/+248
| * | enabling all corners of a sim to be set in one callSignpostMarv2012-06-061-1/+11
| * | Ensure closure of bitmap and memory stream with using() statements in WorldVi...Justin Clark-Casey (justincc)2012-06-061-7/+8
| * | Stop accidentally reading 4 Int16s instead of 2 in SIZE section of Terragen f...Justin Clark-Casey (justincc)2012-06-051-2/+0
| * | minor: Add user feedback when executing fix-phantomsJustin Clark-Casey (justincc)2012-06-051-0/+2
| * | Allow fix-phantoms command to appear even if CombineContiguousRegions = false...Justin Clark-Casey (justincc)2012-06-051-13/+11
| * | Mantis 4597 AgentPaused packet is ignored.Talun2012-06-051-3/+15
| * | Remove unused ScenePresence list structure in llGetAgentList()Justin Clark-Casey (justincc)2012-06-051-1/+0
| * | Scale down per frame MS stats to match scaled simulator FPS stat.Justin Clark-Casey (justincc)2012-06-051-1/+1
| * | Start sending spare frame time MS viewer stat. Make frame time correctly dis...Justin Clark-Casey (justincc)2012-06-052-78/+124
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-06-053-38/+50
| |\ \
| | * | Add replaceable region modules to the "show modules" commandBlueWall2012-06-041-29/+49
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-06-041-1/+1
| | |\ \
| | | * | Correct the delegate specification in EventManager.TriggerTerrainTainted. Loo...Robert Adams2012-06-041-1/+1
| | * | | Remove the "Profile" config as it's covered by the replaceable interfaceMelanie2012-06-041-8/+0
| | |/ /
| * | | Properly show per frame millisecond statistics per frame, not as amount of ti...Justin Clark-Casey (justincc)2012-06-041-22/+41
| |/ /
* | | 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