aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into httptestsUbitUmarov2017-10-264-53/+72
|\
| * Fixed typo in a comment.Kevin Cozens2017-10-261-1/+1
| * Added missing Allow line for osGetSimulatorMemoryKB.Kevin Cozens2017-10-261-0/+1
| * Sorted the groups of Allow statements by alphabetical order.Kevin Cozens2017-10-261-10/+10
| * Corrected name of function in call to CheckThreatLevel.Kevin Cozens2017-10-261-1/+1
| * Whitespace cleanup.Kevin Cozens2017-10-261-19/+19
| * mantis 8253: try to recover information about takecontrols pass=false contro...UbitUmarov2017-10-251-22/+40
* | Merge branch 'master' into httptestsUbitUmarov2017-10-153-1/+23
|\ \ | |/
| * add osGetSimulatorMemoryKB(). This allows work around the fact osGetSimulator...UbitUmarov2017-10-153-1/+23
* | Merge branch 'master' into httptestsUbitUmarov2017-10-134-16/+31
|\ \ | |/
| * Merge branch 'master' of git://opensimulator.org/git/opensim (Ubit beatRobert Adams2017-10-131-4/+7
| |\
| | * mantis 8249: give better data to llDetectedGrabUbitUmarov2017-10-131-4/+7
| * | BulletSim: Add parameter "[BulletSim]AvatarWalkVelocityFactor=1.0" toRobert Adams2017-10-132-4/+13
| |/
| * remove a dead line of codeUbitUmarov2017-10-061-1/+1
| * mantis 8246: don't allow 'delete object name' to delete attachments, but all...UbitUmarov2017-10-061-9/+12
* | Merge branch 'master' into httptestsUbitUmarov2017-10-014-0/+6
|\ \ | |/
| * bug fix: add missing stub for osSetInertiaUbitUmarov2017-10-012-0/+6
| * BulletSim: update MacOS version of libBulletSim to latest version.Robert Adams2017-09-202-0/+0
* | replace libomv saving a few op on vector * quaternionUbitUmarov2017-09-171-0/+0
* | Merge branch 'master' into httptestsUbitUmarov2017-09-162-2/+2
|\ \ | |/
| * bug fix: Of course i had to pick a wrong number for profileBeginUbitUmarov2017-09-162-2/+2
* | Merge branch 'master' into httptestsUbitUmarov2017-09-163-9/+21
|\ \ | |/
| * double request.ReadWriteTimeoutUbitUmarov2017-09-161-2/+2
| * bug fix. Increase the values of profileHollow and profileBegin used to match ...UbitUmarov2017-09-162-7/+19
* | ubOde: comment out some debug statsUbitUmarov2017-09-081-13/+14
* | ubOde: hashSpaces aren't that niceUbitUmarov2017-09-083-188/+107
* | Merge branch 'master' into httptestsUbitUmarov2017-09-0516-86/+414
|\ \ | |/
| * BulletSim: Merge branch 'BulletSim2017'Robert Adams2017-09-0516-86/+414
| |\
| | * BulletSim: add raycast filteringRobert Adams2017-09-051-3/+35
| | * BulletSim: first version of raycast. Only single contact point and noRobert Adams2017-09-038-128/+137
| | * BulletSim; Update BulletSim.dll's and so's for raycast.Robert Adams2017-09-034-0/+0
| | * BulletSim: modify taint processing which use locks.Robert Adams2017-09-025-27/+62
| | |\
| | | * BulletSim: add clock and change logic for taint processing a littleRobert Adams2017-08-285-27/+62
| | * | BulletSim: most of the plumbing for raycast. Needs new BulletSim.dll toRobert Adams2017-09-028-0/+252
* | | | Merge branch 'master' into httptestsUbitUmarov2017-09-042-5/+5
|\ \ \ \ | |/ / /
| * | | Fixed typos in comments in osslEnable.iniKevin Cozens2017-09-041-2/+2
| * | | Fixed typo in function name HaveNotifiedLogOfScriptStopMistmatch.Kevin Cozens2017-09-041-3/+3
| |/ /
* | | fix our name is OpenSimulator not OpenSimUbitUmarov2017-08-313-2/+2
* | | improve Prefer32bit configuration optionUbitUmarov2017-08-315-3/+24
* | | .net4.5, take2; vs2010 does not do it, try to make mono5.x msbuild more happyUbitUmarov2017-08-313-95/+94
* | | test: .net framework4.5UbitUmarov2017-08-311-2/+27
* | | CSharp targets name still wrongUbitUmarov2017-08-312-1/+1
* | | fix a whitecode bug, add missing filesUbitUmarov2017-08-317-1/+429
* | | fix a prebuild VS targets assembly nameUbitUmarov2017-08-313-1/+131
* | | make option Prefer32bit default to false. Thanks Freaky TechUbitUmarov2017-08-303-2/+7
* | | update Prebuild with WhiteCore versionUbitUmarov2017-08-3054-8761/+8863
* | | Merge branch 'master' into httptestsUbitUmarov2017-08-291-10/+14
|\ \ \ | |/ /
| * | fix cache.cs (used on parcels info)UbitUmarov2017-08-291-10/+14
* | | update httpserverUbitUmarov2017-08-282-0/+0
* | | fix some nunit testsUbitUmarov2017-08-282-4/+9