aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-284-1/+4
|\
| * Remove a couple of compiler warnings pointed out by SignpostMarvJustin Clark-Casey (justincc)2012-07-271-1/+0
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring wi...Justin Clark-Casey (justincc)2012-07-254-0/+4
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-251-1/+1
* | Merge branch 'ubitwork' into avinationMelanie2012-07-171-10/+47
|\ \
| * | fix PollServiceRequestManagerUbitUmarov2012-07-171-10/+47
* | | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-171-7/+6
|/ /
* | Merge branch 'avination' into careminsterMelanie2012-07-161-1/+3
|\ \
| * | Eliminate a spurious exception report when a https url is accessed with a wrongMelanie2012-07-151-0/+2
* | | Merge branch 'master' into careminsterMelanie2012-07-121-2/+2
|\ \ \ | | |/ | |/|
| * | Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than c...Justin Clark-Casey (justincc)2012-07-111-2/+2
* | | Merge branch 'avination' into careminsterMelanie2012-07-063-2/+251
|\ \ \ | | |/ | |/|
| * | Convert the slow request queue into a regular queue and add some cleanupMelanie2012-07-061-4/+18
| * | Fix the boo-booMelanie2012-07-051-3/+3
| * | Add an EventType enum and Type field to the poll service event args. This allowsMelanie2012-07-052-11/+34
| * | use the pollEvent timeout paramenter on poolingUbitUmarov2012-07-041-4/+7
| * | added a timeout paramenter to PollServiceEventArgs, so each type can define ...UbitUmarov2012-07-041-1/+4
| * | *test2* http poll: increased again the pool rate do 10/s but increased timeou...UbitUmarov2012-07-041-2/+2
| * | *test* slow http retries pool rate to original 1sUbitUmarov2012-07-041-1/+1
| * | *TO CHECK/REVIEW/REVERT/TEST whatever* pollService new requests get enqueued ...UbitUmarov2012-07-012-0/+206
* | | Merge branch 'avination' into careminsterMelanie2012-06-292-5/+15
|\ \ \ | |/ /
| * | Add an event to the poll service manager thread to allow starting itMelanie2012-06-262-4/+14
* | | Merge branch 'master' into careminsterMelanie2012-06-263-6/+12
|\ \ \ | | |/ | |/|
| * | Avoid a race condition where an incoming request to a script external URL can...Justin Clark-Casey (justincc)2012-06-222-5/+11
| * | If starting scripts on initial sim start, provide INFO level log feedback eac...Justin Clark-Casey (justincc)2012-06-221-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-06-212-4/+4
|\ \ \ | |/ /
| * | Remove STARTUP COMPLETE message from the startuplogo.txt file and into main l...Justin Clark-Casey (justincc)2012-06-201-1/+3
| * | Comment out the neighbour and land in connectors from info logging that they ...Justin Clark-Casey (justincc)2012-06-201-1/+1
| * | Fix bug introduced in commit c6e3752 (13 Jun 2012) where poll responses would...Justin Clark-Casey (justincc)2012-06-161-3/+1
* | | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \ \ | |/ /
| * | Put all debug console commands into a single Debug section rather than scatte...Justin Clark-Casey (justincc)2012-06-151-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-06-152-29/+195
|\ \ \ | |/ /
| * | Make the "debug http" command available for robust as well as the simulator. ...Justin Clark-Casey (justincc)2012-06-152-4/+59
| * | Add main instance to internal MainServer.m_Servers list to simplify internal ...Justin Clark-Casey (justincc)2012-06-152-11/+61
| * | When setting debug http level, do this for all known http servers, not just t...Justin Clark-Casey (justincc)2012-06-152-21/+40
| * | Get rid of some unnecessary null checks in RegionApplicationBase.StartupSpeci...Justin Clark-Casey (justincc)2012-06-151-4/+27
| * | Shuffle "debug http" levels so that 1 and 2 now cause different levels of war...Justin Clark-Casey (justincc)2012-06-141-8/+27
* | | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \ \ | |/ /
| * | Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752Justin Clark-Casey (justincc)2012-06-141-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-06-135-313/+169
|\ \ \ | |/ /
| * | Don't include time to transmit response back to requester when assessing slow...Justin Clark-Casey (justincc)2012-06-135-314/+169
* | | Merge branch 'master' into careminsterMelanie2012-06-072-1/+3
|\ \ \ | |/ /
| * | Make change to fix Windows buildsBlueWall2012-06-071-1/+1
| * | Allow the thread watchdog to accept an alarm method that is invoked if the ti...Justin Clark-Casey (justincc)2012-06-071-0/+2
* | | Merge branch 'master' into careminsterMelanie2012-05-271-135/+244
|\ \ \ | |/ /
| * | adding status codes from rfc 6585SignpostMarv2012-05-241-2/+22
| * | porting IDE tooltip-friendly documentation tweaks from Aurora-SimSignpostMarv2012-05-241-134/+223
* | | Merge branch 'master' into careminsterMelanie2012-05-101-2/+2
|\ \ \ | |/ /
| * | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-091-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-05-081-19/+19
|\ \ \ | |/ /