aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-272-7/+9
|\
| * Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-272-6/+8
* | Merge branch 'master' into careminsterMelanie2013-01-264-6/+71
|\ \ | |/
| * Fix issue where the "set terrain texture" console command did not tell the vi...Justin Clark-Casey (justincc)2013-01-261-1/+1
| * Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so th...Justin Clark-Casey (justincc)2013-01-262-2/+60
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-261-86/+116
| |\
| * | Mantis 6343: Turn a prim to flexy to OFF don't work llSetPrimParamsTalun2013-01-261-3/+10
* | | Merge branch 'master' into careminsterMelanie2013-01-268-119/+307
|\ \ \ | | |/ | |/|
| * | * This adds llVolumeDetect functionality to the C# implementation of BulletSim.teravus2013-01-251-86/+116
| |/
| * minor: Fix full scene part console report to show proper Light* names rather ...Justin Clark-Casey (justincc)2013-01-261-5/+5
| * minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to disable...Justin Clark-Casey (justincc)2013-01-261-0/+2
| * Disable json tests for now - I see this is failing on jenkins because mono 2....Justin Clark-Casey (justincc)2013-01-252-32/+29
| * See if getting the registering JsonReadNotecard with MethodInfo works around ...Justin Clark-Casey (justincc)2013-01-251-2/+5
| * Increase logging by enabling during test setup rather than during individual ...Justin Clark-Casey (justincc)2013-01-251-4/+6
| * Enable logging in new json store tests to find out why they fail on jenkins b...Justin Clark-Casey (justincc)2013-01-251-4/+4
| * Add JsonTestPath() regression testJustin Clark-Casey (justincc)2013-01-251-0/+17
| * Add regression test for JsonSetValue()Justin Clark-Casey (justincc)2013-01-251-0/+23
| * minor: remove mono compiler warning in SceneCommandsModuleJustin Clark-Casey (justincc)2013-01-251-1/+1
| * Add basic JsonGetValue() regression test.Justin Clark-Casey (justincc)2013-01-251-0/+17
| * Add basic JsonCreateStore() regression testJustin Clark-Casey (justincc)2013-01-252-1/+87
| * BulletSim: reduce the force of gravity on ground vehicles when theyRobert Adams2013-01-241-0/+11
* | Merge branch 'master' into careminsterMelanie2013-01-2519-191/+670
|\ \ | |/
| * BulletSim: reduce the zeroing threshold for rotational velocity.Robert Adams2013-01-241-3/+1
| * BulletSim: disable CCD (continuious collision detection) andRobert Adams2013-01-241-3/+3
| * BulletSim: zero motion on an object that we pop up because it isRobert Adams2013-01-241-1/+7
| * BulletSim: remove exception that can happen when setting physics parameters f...Robert Adams2013-01-241-2/+2
| * Mantis 6508 llHTTPResponse body is incorrectly interpreted by IETalun2013-01-241-1/+15
| * Add JSONification of WebStats module. Adds a '?json' query parameterRobert Adams2013-01-2410-11/+281
| * * Added in the manifold point dept on collision desc. In BulletSim engine Bul...teravus2013-01-241-5/+64
| * * Repairs the Object updates, Collision updates, and Child Prim methods makin...teravus2013-01-241-164/+282
| * * This makes the non-physics llCastRay 'better'. It's not 'correctly work...teravus2013-01-232-4/+18
| * Remove unnecessary System.Linq reference from Compiler.csJustin Clark-Casey (justincc)2013-01-241-1/+0
* | Merge branch 'avination' into careminsterMelanie2013-01-247-16/+36
|\ \
| * | Make llGiveMoney async again. The return value is now the constant 1 to makeMelanie2013-01-241-8/+10
| * | Reintroduce the return value of llGiveMoney. The grid will crash and burn wit...Melanie2013-01-243-12/+12
| * | Null check the response body to make sure we're not crashing the script engineMelanie2013-01-241-0/+6
| * | Prevent double ground collisions and prefer the physics result if there is one.Melanie2013-01-231-3/+15
| * | Fix a type (Suports => Supports). Also put the normal terrain collision checkMelanie2013-01-234-12/+12
* | | Merge branch 'master' into careminsterMelanie2013-01-244-4/+11
|\ \ \ | | |/ | |/|
| * | Disable the not very useful infinite recursion co-op termination tests for no...Justin Clark-Casey (justincc)2013-01-241-2/+6
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-242-2/+4
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-01-2314-131/+604
| | |\ \
| | * | | BulletSim: pass up and report the real collision penetration.Robert Adams2013-01-232-2/+4
| * | | | Fix mono 2.4.3 build break by using CreateInstanceAndUnwrap 9 method call dep...Justin Clark-Casey (justincc)2013-01-241-0/+1
| | |/ / | |/| |
* | | | Merge branch 'master' into careminsterMelanie2013-01-2424-245/+688
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into coopterminationJustin Clark-Casey (justincc)2013-01-2454-12696/+1815
| |\ \ \ | | |/ /
| | * | BulletSim: remove setting of vehicle InterpolationRotationalVelocity.Robert Adams2013-01-232-36/+34
| | * | BulletSim: small change to center-of-mass computation left out last commitRobert Adams2013-01-231-3/+8
| | * | BulletSim: center-of-gravity linkset changes. Not working yet.Robert Adams2013-01-234-29/+9
| | * | BulletSim: working on COMRobert Adams2013-01-234-7/+36