aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | fix mergeUbitUmarov2017-12-303-53/+148
|\ \ | |/
| * clean some extra space charsUbitUmarov2017-12-301-1/+1
| * mantis 8271: work around missing encoding of estate bans on the pseudo url en...UbitUmarov2017-12-302-53/+116
| * add missing entry on prebuid.xml for mutelist serviceUbitUmarov2017-12-201-1/+60
* | 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
|\ \ | |/
| * 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 mutelist...UbitUmarov2017-11-175-120/+411
| * 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
| * add AGENT_LIST_EXCLUDENPC bit mask option to llGetAgentList scope to exclude...UbitUmarov2017-11-142-0/+11
| * Changing map tile colors This change also allows setting the water color, as ...TomTheDragon2017-11-133-23/+47
* | Merge branch 'master' into httptestsUbitUmarov2017-11-123-10/+19
|\ \ | |/
| * mantis 8253: don't let attachments delete remove controls from viewers on cro...UbitUmarov2017-11-122-10/+4
| * 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
* | Merge branch 'master' into httptestsUbitUmarov2017-11-121-1/+3
|\ \ | |/
| * add a warning in opensim.ini.example mute lists, about the fact viewers cache...UbitUmarov2017-11-121-1/+3
* | 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 jo...UbitUmarov2017-11-121-16/+0
| * mantis 8260 fix script count on delete and remove redundantTriggerRemoveScrip...UbitUmarov2017-11-082-5/+5
| * mantis 8263: recover the ignore of texture changes if only materialID changed...UbitUmarov2017-11-081-2/+4
| * remove a potencial (and silly) deadlock; let other texture parameters changes...UbitUmarov2017-11-082-27/+46
| * Add a new experimental implementation of PGSQL FSAssetsTomTheDragon2017-11-032-0/+330
* | Merge branch 'master' into httptestsUbitUmarov2017-10-302-0/+5
|\ \ | |/
| * mantis 8258: also limit mesh basic shape torus hole sizeY on (some) existent...UbitUmarov2017-10-301-0/+3
| * 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 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
|\ \ | |/