aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into httptestsUbitUmarov2017-12-143-16/+38
|\ \ | |/
| * add a missing return on a mesh decode error in ubOdemeshmerizerUbitUmarov2017-12-141-1/+2
| |
| * mantis 8255 update example_web.xmlUbitUmarov2017-12-131-8/+26
| |
| * mantis 8250: try to work around timing issuesUbitUmarov2017-12-131-7/+10
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-12-1225-147/+1403
|\ \ | |/ | | | | | | # Conflicts: # prebuild.xml
| * commit what i did so far for core mutes module, befere i lose itUbitUmarov2017-12-118-69/+546
| |
| * increase sample rate of WaitGetScenePresence()UbitUmarov2017-12-113-2/+10
| |
| * move some sharable items out of Xmute to Framework; add another test ↵UbitUmarov2017-11-175-120/+411
| | | | | | | | mutelistmodule, ignore it
| * try kick jenkins/nant 2UbitUmarov2017-11-161-114/+116
| |
| * try kick jenkins/nantUbitUmarov2017-11-161-2/+2
| |
| * add missing part of mutes list protocolUbitUmarov2017-11-165-3/+47
| |
| * Donating the Avination Mute ModuleMelanie Thielker2017-11-143-0/+376
| | | | | | | | | | | | | | | | This lived out-of-tree and therefore wasn't part of the big code drop. It's classic Avination, tied to MySQL and a direct database connection and I don't have the bandwidth to fix it to core methods. However, it has all the strange mute logic that OpenSim was missing and maybe someone can step up to make it work in an open grid context.
| * add AGENT_LIST_EXCLUDENPC bit mask option to llGetAgentList scope to ↵UbitUmarov2017-11-142-0/+11
| | | | | | | | exclude NPCs
| * Changing map tile colors This change also allows setting the water color, as ↵TomTheDragon2017-11-133-23/+47
| | | | | | | | | | | | well as the 4 colors for textured map tiles. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* | Merge branch 'master' into httptestsUbitUmarov2017-11-123-10/+19
|\ \ | |/
| * mantis 8253: don't let attachments delete remove controls from viewers on ↵UbitUmarov2017-11-122-10/+4
| | | | | | | | crossings.
| * mantis 8200: move changes in PGSQL from last commit to a new transaction (13)UbitUmarov2017-11-121-10/+15
| |
| * PGSQL EstateStore create estate_settings_id SEQUENCETomTheDragon2017-11-121-0/+10
| | | | | | | | | | | | | | Missing creation for estate_settings_id sequence causes first run to fail unless manually added. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* | Merge branch 'master' into httptestsUbitUmarov2017-11-121-1/+3
|\ \ | |/
| * add a warning in opensim.ini.example mute lists, about the fact viewers ↵UbitUmarov2017-11-121-1/+3
| | | | | | | | cache beening shared by all grids, and that can be confusing
* | 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
|\ \ | |/
generated by cgit v1.1 at 2024-12-29 18:24:37 +0000