aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into httptestsUbitUmarov2017-11-128-54/+391
|\
| * change opensim.ini.example mutes coments to express what our current code doesUbitUmarov2017-11-121-6/+8
| |
| * off line module V2 must not sent a empty mutes list. That is mutes modules ↵UbitUmarov2017-11-121-16/+0
| | | | | | | | job (or let viewers use they cached entries if none)
| * mantis 8260 fix script count on delete and remove ↵UbitUmarov2017-11-082-5/+5
| | | | | | | | redundantTriggerRemoveScript in 2 points
| * mantis 8263: recover the ignore of texture changes if only materialID ↵UbitUmarov2017-11-081-2/+4
| | | | | | | | changed. That should be done by respective cap (as before)
| * remove a potencial (and silly) deadlock; let other texture parameters ↵UbitUmarov2017-11-082-27/+46
| | | | | | | | changes trigger Changed.TEXTURE event
| * Add a new experimental implementation of PGSQL FSAssetsTomTheDragon2017-11-032-0/+330
| | | | | | | | Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* | Merge branch 'master' into httptestsUbitUmarov2017-10-302-0/+5
|\ \ | |/
| * mantis 8258: also limit mesh basic shape torus hole sizeY on (some) ↵UbitUmarov2017-10-301-0/+3
| | | | | | | | existent objects.
| * mantis 8258: change Mesh basic shape pathScaleY in case of TorusUbitUmarov2017-10-301-0/+2
| |
* | 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 ↵UbitUmarov2017-10-251-22/+40
| | | | | | | | controls on crossings, also tell viewers about them. this may still not be correct. Use of multiple TakeControls on same avatar can still give unpredictable results (also on normal operation). In same cases last executed my override previus or not. Also change agent updates wait code
* | Merge branch 'master' into httptestsUbitUmarov2017-10-153-1/+23
|\ \ | |/
| * add osGetSimulatorMemoryKB(). This allows work around the fact ↵UbitUmarov2017-10-153-1/+23
| | | | | | | | osGetSimulatorMemory() reports at most 2GB. This one limit is now 2TB, should ne enought for a while
* | 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
| |\ | | | | | | | | | me to the repository).
| | * mantis 8249: give better data to llDetectedGrabUbitUmarov2017-10-131-4/+7
| | |
| * | BulletSim: Add parameter "[BulletSim]AvatarWalkVelocityFactor=1.0" toRobert Adams2017-10-132-4/+13
| |/ | | | | | | | | | | | | | | | | | | adjust the walking speed passed from the simulator. Default is 1.0f so there should be no change for regions who do not change the factor. The adjustment for walking speed and AlwaysRun speed should be in the simulator and not the physics engines (who all assume TargetVelocity.set is only used for avatar walking/running) but that would require tweaking all the phyiscs engines.
| * remove a dead line of codeUbitUmarov2017-10-061-1/+1
| |
| * mantis 8246: don't allow 'delete object name' to delete attachments, but ↵UbitUmarov2017-10-061-9/+12
| | | | | | | | allow delete object id, with confirmation
* | 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
| | | | | | | | | | See Mantis 8232. Thanks Gavin Hird.
* | 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
| | | | | | | | pbs number of faces and the Mesh number of faces. The small values i used before seem to be randomly lost.
* | 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
| |\ | | | | | | | | | Adds raycast using Bullet physics engine.
| | * 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
| | | | | | | | | | | | filtering.
| | * 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
| | |\ | | | | | | | | | | | | (Merge branch 'bullettaint' into bulletcast)
| | | * BulletSim: add clock and change logic for taint processing a littleRobert Adams2017-08-285-27/+62
| | | | | | | | | | | | | | | | | | | | so taints check if they are not in simulation time and execute immediately if not.
| | * | BulletSim: most of the plumbing for raycast. Needs new BulletSim.dll toRobert Adams2017-09-028-0/+252
| | | | | | | | | | | | | | | | work.
* | | | 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
| | |