aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * 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-238-79/+161
|\ \ \
| * | | 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
| * | | 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
| | * | | Revert "Refactor scripted http request to use async calls rather than hard th...Melanie2013-01-201-87/+53
| | * | | Refactor scripted http request to use async calls rather than hard threadsMelanie2013-01-201-53/+87
| | * | | Remove an extra ScriptSleep (merge artefact) from llSetLinkPrimitiveParamsFastMelanie2013-01-191-2/+0
| * | | | * Fix notecard loading - If the notecard name is formatted like a UUID but is...teravus2013-01-211-11/+35
* | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-01-2311-482/+201
|\ \ \ \ \
| * \ \ \ \ Merge branch 'avination'Melanie2013-01-1911-482/+201
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Remove group IM test code also mentioning "OpenSimulator Testing"Melanie2013-01-191-26/+1
| | * | | | Remove the core groups moduleMelanie2013-01-191-252/+0
| | * | | | Kill the dumb Opensimulator Testing group again - for good.Melanie2013-01-191-8/+3
| | |/ / /
| | * | | Merge branch 'ubitwork' into avinationMelanie2013-01-163-7/+11
| | |\ \ \
| | | * | | dont send a full grp update on stopmovetotarget. just a rootpart terseUbitUmarov2013-01-162-1/+3
| | | * | | same for SetPrimParamsUbitUmarov2013-01-161-3/+4
| | | * | | llSetPos on child prim, send only a part terse update and not a group oneUbitUmarov2013-01-161-3/+4
| | * | | | * Enables loading cached bakes on teleport by filling in the appropriate avat...teravus2013-01-161-2/+71