aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into httptestsUbitUmarov2017-01-0622-190/+344
|\
| * UserLevel must have a trusted sourceMelanie Thielker2017-01-061-4/+0
| * Restructure god level and permissionsMelanie Thielker2017-01-0622-150/+105
| * Add GodController classMelanie Thielker2017-01-051-0/+231
| * inform viewers of current godlevel; put back a small delay on teleport arriv...UbitUmarov2017-01-051-11/+34
| * allow initial automatic level to be changed by request. Since viewers still d...UbitUmarov2017-01-051-6/+6
| * add config option automatic_gods. With this option true, users that can be Go...UbitUmarov2017-01-054-9/+43
| * remove code i started but didn't finishUbitUmarov2017-01-051-85/+0
* | fix mergeUbitUmarov2017-01-05960-24683/+24696
|\ \ | |/
| * Massive tab and trailing space cleanupMelanie Thielker2017-01-05959-24588/+24588
| * Make it possible to disable the bakes module in the way it is described in co...Melanie Thielker2017-01-051-1/+10
| * Merge branch 'master' of opensimulator.org:/var/git/opensimUbitUmarov2017-01-053-5/+24
| |\
| | * Make the estate communications handler selectableMelanie Thielker2017-01-051-0/+19
| | * Rename the files and classes from XEstate to EstateMelanie Thielker2017-01-053-5/+5
| * | a few changes to Gods ( ie administrators) controlUbitUmarov2017-01-055-119/+99
| |/
| * a few changes to estates port handlingUbitUmarov2017-01-052-7/+12
* | Merge branch 'master' into httptestsUbitUmarov2017-01-0510-72/+116
|\ \ | |/
| * a few changes to estates and estate teleportHome (used kick)UbitUmarov2017-01-055-47/+78
| * Fix some permissions checks in groupsMelanie Thielker2017-01-051-3/+16
| * Create all tables ad InnoDB by defaultMelanie Thielker2017-01-054-22/+22
* | Merge branch 'master' into httptestsUbitUmarov2017-01-045-8/+47
|\ \ | |/
| * The robust command login reset should return config value: MinLoginLevel. Def...Mandarinka Tasty2017-01-041-2/+2
| * PGSQL fixed a missing cast to uuid in XInventoryDataGeir Nøklebye2017-01-041-1/+1
| * Show details of scene objects with given ownerId.Mandarinka Tasty2017-01-041-0/+35
| * Set a sensible default for the MaxAgentGroups parameterMelanie Thielker2017-01-041-1/+1
| * Suppress misleading message when logging in locallyMelanie Thielker2017-01-031-2/+6
| * Suppress error messages in the log if functions are not enabled. Just return ...Melanie Thielker2017-01-031-2/+2
* | Merge branch 'master' into httptestsUbitUmarov2017-01-0315-7489/+8324
|\ \ | |/
| * Merge branch 'master' of opensimulator.org:/var/git/opensimMelanie Thielker2017-01-024-6/+32
| |\
| | * Create a generic way for passing constructor args to pluginsMelanie Thielker2017-01-024-6/+32
| * | Add the HGRemoteAssetService. Allows to use any asset service with HGMelanie Thielker2017-01-021-0/+240
| |/
| * Replaced OpenMetaverse libs/xmls with new ones. Also added a file in openmeta...Diva Canto2016-12-317-7477/+8039
| * mantis 8106: improve avatar walk in mouselookUbitUmarov2016-12-301-4/+10
| * Fake accepting materials (Type == -2) on FSAssets.Melanie Thielker2016-12-301-0/+3
| * remove a gc.collect that isn't very usefull (on the right engine thisUbitUmarov2016-12-302-1855/+2602
| * remove a gc.collect that isn't very usefullUbitUmarov2016-12-301-2602/+1853
* | some cleanup, use more using(), more checks so http request mem stream is closedUbitUmarov2016-12-303-42/+27
* | Merge branch 'master' into httptestsUbitUmarov2016-12-301-3/+3
|\ \ | |/
| * fix typosUbitUmarov2016-12-301-3/+3
* | Merge branch 'master' into httptestsUbitUmarov2016-12-3023-61/+270
|\ \ | |/
| * Serving robots.txt from bin Idea of solution for http://opensimulator.org/man...Mandarinka Tasty2016-12-292-0/+21
| * Add a MaxRetries option to the inventory connector.Melanie Thielker2016-12-292-2/+16
| * Add negative caching to flotsam cache. Prevents scripts from hammering the as...Melanie Thielker2016-12-297-2/+92
| * Actually rename the file, tooMelanie Thielker2016-12-291-0/+0
| * Refactor: Rename IImprovedAssetCache to IAssetCache as the old IAssetCache is...Melanie Thielker2016-12-2915-36/+36
| * Add an option to update the file access time even when an asset is found in c...Melanie Thielker2016-12-291-0/+15
| * expire also from weak referencesUbitUmarov2016-12-291-0/+3
| * forgot one gc.collect wait for finalizersUbitUmarov2016-12-291-1/+5
| * gc is also a unwanted cache, so use it. With this, memcache with short expire...UbitUmarov2016-12-292-14/+73
| * reinforce gc.collect on region load to also do pending finalizersUbitUmarov2016-12-292-6/+9