Merge branch 'master' into httptests

Author UbitUmarov <ajlduarte at sapo dot pt>
Author date 2017-05-31 06:21:21
Author local date 2017-05-31 07:21:21 +0100
Committer UbitUmarov <ajlduarte at sapo dot pt>
Committer date 2017-05-31 06:21:21
Committer local date 2017-05-31 07:21:21 +0100
Commit 55babdc16090397499081f0428500babe383ff3a
Tree efb2f7ec13abba489d6318ebace8a86c6cde66c6
Parent 6a0eba3d7b3e580ce074b0b3cd13694fce31df2f
Parent 7217c2029198855a465c7927659964ecedf422cc
Merge branch 'master' into httptests
Affected files:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Server/ServerMain.cs
ViewGit