aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmergeMelanie2011-10-253-129/+195
|\
| * refactor: make methods that do not need to be public in ODE private or intern...Justin Clark-Casey (justincc)2011-10-153-129/+195
* | Merge commit '4bfc2f5cdea4b739110cae3b37945d88ad527334' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * Change hardcoded ODE total frame time to match the default total frame time (...Justin Clark-Casey (justincc)2011-10-141-1/+1
* | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmergeMelanie2011-10-255-6/+6
|\ \ | |/
| * refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it s...Justin Clark-Casey (justincc)2011-10-145-6/+6
* | Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmergeMelanie2011-10-252-88/+125
|\ \ | |/
| * Extract NullPhysicsScene from PhysicsScene to improve code readabilityJustin Clark-Casey (justincc)2011-10-142-88/+125
* | Merge commit 'ee84c0589ccca1e7f3216ca1395c3002b773f30f' into bigmergeMelanie2011-10-251-0/+5
|\ \ | |/
| * Don't execute rest of code in XEngine.RemoveRegion() and Close() if the modul...Justin Clark-Casey (justincc)2011-10-141-0/+6
* | Merge commit '4e7d4330c2b2c61e64c9f82efa7b824b717b2e4d' into bigmergeMelanie2011-10-251-19/+33
|\ \ | |/
| * Expose minimum frame time and update periods for experimentation.Justin Clark-Casey (justincc)2011-10-131-19/+33
* | Merge commit '128d8dfd8b355f84a71e2093e942937ca720c5c6' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * refactor: Put the frame update period when temporary objects are cleaned up i...Justin Clark-Casey (justincc)2011-10-131-4/+4
* | Merge commit 'fd274a668803bc3da4cec95180538116038b503a' into bigmergeMelanie2011-10-251-29/+1
|\ \ | |/
| * refactor: chain the two scene constructors together to eliminate more copypastaJustin Clark-Casey (justincc)2011-10-131-29/+1
* | Merge commit 'a6fa15e8b65a123d79a1bea8cccb459f76139314' into bigmergeMelanie2011-10-252-6/+13
|\ \ | |/
| * Tie reported FPS correction factor into the minimum frame time rather than se...Justin Clark-Casey (justincc)2011-10-132-6/+13
* | Merge commit 'ceb326284e49f0817fa0f848136ff60e6f66568f' into bigmergeMelanie2011-10-251-1/+12
|\ \ | |/
| * Move fps stat adjustment factor into field rather than hard-coded.Justin Clark-Casey (justincc)2011-10-131-1/+12
* | Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmergeMelanie2011-10-253-8/+39
|\ \ | |/
| * More method doc and formatting changes. Makes DestroyOdeStructures() privateJustin Clark-Casey (justincc)2011-10-133-8/+39
* | Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmergeMelanie2011-10-252-91/+79
|\ \ | |/
| * refactor: move 3x copy/pasted ode structure removal code in ODECharacter into...Justin Clark-Casey (justincc)2011-10-132-91/+79
* | Merge commit 'f08664f422f984fa57cc0ecb97c04eee3dccd183' into bigmergeMelanie2011-10-253-9/+1
|\ \ | |/
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2011-10-123-44/+1
* | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmergeMelanie2011-10-252-3/+1
|\ \ | |/
| * Get rid of some traces of the old pre-ROBUST grid architecture configJustin Clark-Casey (justincc)2011-10-122-3/+1
* | Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmergeMelanie2011-10-255-343/+282
|\ \ | |/
| * Bring LindenUDP.Tests back from the dead. No tests are running.Justin Clark-Casey (justincc)2011-10-125-343/+282
* | Merge commit 'ea7366ddc6f0e13519589fcaa3729fd36b5eef79' into bigmergeMelanie2011-10-252-2/+2
|\ \ | |/
| * When shutting down XEngine, log how many scripts are being shutdown so the us...Justin Clark-Casey (justincc)2011-10-122-2/+5
* | Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmergeMelanie2011-10-253-3/+12
|\ \ | |/
| * minor: insert some commented out log lines which are a blunt but useful instr...Justin Clark-Casey (justincc)2011-10-123-3/+12
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-121-1/+1
| |\
* | \ Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmergeMelanie2011-10-253-17/+39
|\ \ \ | |/ /
| * | Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollectionJustin Clark-Casey (justincc)2011-10-123-17/+39
* | | Fix ground sit autopilotMelanie2011-10-252-9/+19
* | | Fake an AgentCircuitData if none is available rather than crashing outMelanie2011-10-241-2/+24
* | | Allow updating the movement animation while flying. This fixes falling,Melanie2011-10-211-20/+6
* | | Fix up the animator and ScenePresence to like each other againMelanie2011-10-202-7/+24
* | | Merge branch 'master' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | | |/ | |/|
| * | Change default groups messaging module in hardcode to the empty string.Melanie2011-10-121-1/+1
| |/
* | Make WALK animation state work again. TURNLEFT and TURNRIGHT are now rebrokenMelanie2011-10-121-12/+6
* | Merge branch 'master' into bigmergeMelanie2011-10-123-1/+43
|\ \ | |/
| * Start recording object updates per second statistic (analogue of agent update...Justin Clark-Casey (justincc)2011-10-113-1/+43
* | Merge commit 'f138a2056ecea4016d75fec276a390955dbfd688' into bigmergeMelanie2011-10-121-0/+1
|\ \ | |/
| * meaningless change to goose pandaJustin Clark-Casey (justincc)2011-10-111-0/+1
* | Merge commit '28f549bd64eb423ae43a5c23c1da5094e6269150' into bigmergeMelanie2011-10-122-21/+32
|\ \ | |/
| * osSetParcelDetails - PARCEL_DETAILS_CLAIMDATEPixel Tomsen2011-10-112-21/+32