aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into httptestsUbitUmarov2017-05-311-2/+1
|\
| * change servicePoint dns expire also to 5min, let the endpoints expire slide. ↵UbitUmarov2017-05-291-2/+1
| | | | | | | | This should reduce impact of absurd dns fails observed on my test ubuntu VM
* | remove a accent from a method nameUbitUmarov2017-05-271-1/+1
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-05-271-2/+0
|\ \ | |/
| * change wrong watchdog stopped thread check code, and don't log itUbitUmarov2017-05-261-2/+0
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-05-252-2/+9
|\ \ | |/
| * another oneUbitUmarov2017-05-251-1/+8
| |
| * give up on the code to stop AsyncCommandManager. It fails with many scripts ↵UbitUmarov2017-05-241-1/+1
| | | | | | | | running, and its only done deep on exit code. It is a backgroud thread should not block exit and never did
* | merge masterUbitUmarov2017-05-232-1/+6
|\ \ | |/
| * dont log timeouts on stopped threadsUbitUmarov2017-05-231-1/+2
| |
| * no all mono versions know DnsRefreshTimeoutUbitUmarov2017-05-231-1/+2
| |
| * remember mono about the default for DnsRefreshTimeoutUbitUmarov2017-05-231-0/+3
| |
* | Merge branch 'master' into httptestsUbitUmarov2017-05-141-1/+6
|\ \ | |/
| * a bit more on ServicePointManagerUbitUmarov2017-05-121-3/+4
| |
| * lower connection limits againUbitUmarov2017-05-121-1/+5
| |
| * soem changes on connections limitsUbitUmarov2017-05-121-1/+1
| |
* | mergeUbitUmarov2017-05-091-0/+7
|\ \ | |/
| * let .net decide GC mode from its defaults on the platformUbitUmarov2017-05-091-0/+3
| |
| * remove file bin/Mono.Posix.dll that causes problems with monoUbitUmarov2017-05-091-0/+4
| |
| * recover a lost trim in permissions modules names parsingUbitUmarov2017-05-031-1/+1
| |
* | fix mergeUbitUmarov2017-05-031-1/+1
|\ \
| * | recover a lost trim in permissions modules names parsingUbitUmarov2017-05-021-1/+1
| |/
* | fix mergeUbitUmarov2017-04-252-3/+5
|\ \ | |/
| * Merge branch 'melanie'Melanie Thielker2017-02-012-0/+3
| |\
| | * Secure sim stats with an (optional) password.Melanie Thielker2017-02-012-0/+3
| | | | | | | | | | | | | | | There is way too much in these stats to expose them to the world, at least for some of us.
| * | parcels must be loaded before objects, so they can be added to themUbitUmarov2017-01-271-3/+2
| |/
* | fix mergeUbitUmarov2017-01-057-121/+121
|\ \ | |/
| * Massive tab and trailing space cleanupMelanie Thielker2017-01-057-127/+127
| |
* | Merge branch 'master' into httptestsUbitUmarov2016-12-302-0/+21
|\ \ | |/
| * Serving robots.txt from bin Idea of solution for ↵Mandarinka Tasty2016-12-292-0/+21
| | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=7392 Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: Melanie Thielker <melanie@t-data.com>
* | Merge branch 'master' into httptestsUbitUmarov2016-12-231-4/+1
|\ \ | |/
| * Remove obsolete config option "EventQueue". It's been always on for ages!Melanie Thielker2016-12-201-2/+0
| |
| * remove obsolete config option "storage_prim_inventories"Melanie Thielker2016-12-201-2/+1
| |
* | Merge branch 'master' into httptestsUbitUmarov2016-12-141-2/+36
|\ \ | |/
| * Applying a modified version of TomTheDragon's patch to prevent the simMelanie Thielker2016-12-121-7/+14
| | | | | | | | from crashing when signals are unavailable.
| * don't do unix signals on windowsUbitUmarov2016-12-121-6/+12
| |
| * Allow OpenSim to respond to Unix signals. This may need work to beMelanie Thielker2016-12-121-2/+23
| | | | | | | | | | | | properly ignoed on Windows. Windows devs, please test and check for platform flags if this causes issues in Windows
* | remove not needed sslport parameterUbitUmarov2016-12-081-3/+2
| |
* | Merge branch 'master' into httptestsUbitUmarov2016-11-271-6/+6
|\ \ | |/
| * Fix in cmdparams.Length for: SavePrimsXml2 and SaveXmlMandarinka Tasty2016-11-261-2/+2
| | | | | | | | | | Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
| * Fix in descriptions of: load xml, load xml2, save xml, save xml2Mandarinka Tasty2016-11-261-4/+4
| | | | | | | | | | Signed-off-by: Mandarinka Tasty <mandarinka.tasty@gmail.com> Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* | keep a unsecure http port up for external services (datasnapshot search). ↵UbitUmarov2016-10-091-19/+34
| | | | | | | | Only fire poolservices on main http listener
* | changes to regions ssl suport: verify if hostnames are validate by the ↵UbitUmarov2016-10-091-1/+1
| | | | | | | | selected cert, make clear that for now all regions need to have the same ExternalHostName if using sll (due to other code that needs to be changed later)
* | recover regions main http server ssl suport. Using a PKCS12 cert file, and ↵UbitUmarov2016-10-062-7/+33
|/ | | | not certs store for now. Option http_listener_cn, cert CN need to the same as external IP. Self sign certs do seem to work, but the viewers option NoVerifySLLCert needs to be set true. CA check is not done but they do check the IP
* first step removing MegaRegions: refuse to run. Thanks to all that made ↵UbitUmarov2016-07-271-0/+7
| | | | MegaRegions possible, they where a important OpenSim feature, but can no longer be mantained
* Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global ↵Diva Canto2016-02-211-1/+1
| | | | replace anymore.
* Changes to Load Oar options and new code to support importing OARs with ↵Jak Daniels2015-11-221-8/+18
| | | | | | different Region sizes to the destination region. Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
* On to 0.8.3!Diva Canto2015-10-181-1/+1
| | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
* more on compile..UbitUmarov2015-09-081-10/+6
|
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-083-102/+140
|\ | | | | | | | | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1