aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-01-249-18/+54
|\
| * 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
| * Implement get version RemoteAdmin callMelanie2013-01-232-2/+18
| * 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-2458-12707/+1872
| |\ \ \ | | |/ /
| | * | 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
| | * | BulletSim: fix build break introduced by previous commitRobert Adams2013-01-231-5/+0
| | * | BulletSim: remove the unused RestoreBodyDependencies used by linksetsRobert Adams2013-01-233-33/+2
| | * | Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-233-13/+129
| | * | Remove the return value from llGiveMoney and add llTransferLindenDollars. AlsoMelanie2013-01-233-33/+114
| * | | Pass narrower WaitHandle rather than EventWaitHandle as co-op termination wai...Justin Clark-Casey (justincc)2013-01-235-6/+6
| * | | Improve logging by making it clearer which script is failing if an assembly f...Justin Clark-Casey (justincc)2013-01-233-28/+31
| * | | If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then cont...Justin Clark-Casey (justincc)2013-01-235-27/+87
| * | | Add co-op termination regression test for infinite recursive manual call on e...Justin Clark-Casey (justincc)2013-01-221-0/+22
| * | | Set script delay factor to 0 in co-op termination testsJustin Clark-Casey (justincc)2013-01-221-0/+3
| * | | Add regression test for co-op termination on infinite user function call regr...Justin Clark-Casey (justincc)2013-01-221-0/+30
| * | | Add regression test for co-op stop of an infinite jump loopJustin Clark-Casey (justincc)2013-01-221-8/+41
| * | | Add do-while co-op termination testJustin Clark-Casey (justincc)2013-01-221-2/+30
| * | | Add single and comound while loop co-op termination testJustin Clark-Casey (justincc)2013-01-221-0/+44
| * | | Fix bug in generating termination checks in compound statement for loop.Justin Clark-Casey (justincc)2013-01-222-3/+27
| * | | factor out common code in existing co-op termination regression testsJustin Clark-Casey (justincc)2013-01-221-55/+24
| * | | Increase WaitForEventCompletionOnScriptStop to 120 secs to show that the co-o...Justin Clark-Casey (justincc)2013-01-221-0/+4
| * | | minor: comment out Console.WriteLine debugging message in XEngineJustin Clark-Casey (justincc)2013-01-221-1/+1
| * | | Add regression test TestStopOnLongForLoop()Justin Clark-Casey (justincc)2013-01-221-0/+59
| * | | refactor: rename XEngineTest to more descriptive XEngineBasicTestsJustin Clark-Casey (justincc)2013-01-221-0/+0
| * | | Implement non-wait co-operative termination of scripts for XEngine in additio...Justin Clark-Casey (justincc)2013-01-177-77/+271
* | | | Merge branch 'avination' into careminsterMelanie2013-01-239-83/+180
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove the return value from llGiveMoney (it was a LSL extension of OpenSim) andMelanie2013-01-233-31/+29
| * | | EXPERIMENTAL - Comment out the check for the agent already being in transitMelanie2013-01-231-8/+9
| * | | Guard against XMLRPC module ref being null, which will happen if it's disabledMelanie2013-01-231-3/+7
| * | | * A better way to handle the last fix (This is in case the viewer provides a ...teravus2013-01-211-10/+16
| * | | Merge remote-tracking branch 'remotes/origin/avination' into teravusworkteravus2013-01-217-309/+82
| |\ \ \
| | * | | Add accessors to allow serializing rot and position targetsMelanie2013-01-211-2/+12
| | * | | Limit active at targets to 8Melanie2013-01-211-2/+6
| | * | | Prevent scene from holding references to SOGs with attargets beyond SOG deletionMelanie2013-01-211-6/+12
| | * | | Allow TeleportCancel packets to reset the transfer state machineMelanie2013-01-211-0/+6
| | * | | Implement HTTP Request froma thread pool to avoid packet congestionMelanie2013-01-201-14/+45