aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-05-071-19/+19
* | Merge branch 'master' into careminsterMelanie2012-05-059-35/+88
|\ \ | |/
| * minor: Tweak BaseHttpServer message to make it clear that this relates to slo...Justin Clark-Casey (justincc)2012-05-041-1/+1
| * Implement optional name and description on http stream handlers so that we ca...Justin Clark-Casey (justincc)2012-05-039-35/+88
| * Revert "Log the full exception when errors occur in BaseHttpServer"Justin Clark-Casey (justincc)2012-04-271-19/+19
| * Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-04-271-19/+19
* | Merge branch 'master' into careminsterMelanie2012-04-201-2/+2
|\ \ | |/
| * Add more exception detail to Exception and IOException throws in BaseHttpServ...Justin Clark-Casey (justincc)2012-04-201-2/+2
* | Merge branch 'master' into careminsterMelanie2012-04-071-2/+2
|\ \ | |/
| * Thank you, BaseHttpServer, for telling me where things go wrong.Diva Canto2012-04-061-2/+2
* | Merge branch 'master' into careminsterMelanie2012-02-241-0/+2
|\ \ | |/
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-0/+2
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-082-11/+5
|\ \ | |/
| * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-072-11/+5
* | Merge branch 'master' into bigmergeMelanie2011-12-0511-14/+209
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ...Justin Clark-Casey (justincc)2011-12-0511-14/+209
* | Merge branch 'master' into bigmergeMelanie2011-12-011-15/+48
|\ \ | |/
| * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+3
| * With "debug http 1", show the path with the query string instead of just the ...Justin Clark-Casey (justincc)2011-11-291-21/+21
| * Add "debug http" command for currently simple extra debug logging of non-even...Justin Clark-Casey (justincc)2011-11-291-12/+43
* | Merge branch 'master' into bigmergeMelanie2011-11-171-0/+3
|\ \ | |/
| * send a watchdog heartbeat for a poll worker thread when it's actually runJustin Clark-Casey (justincc)2011-11-151-0/+3
* | Merge branch 'master' into bigmergeMelanie2011-11-101-8/+6
|\ \ | |/
| * Remove unused avariable in PollServiceRequestManagerJustin Clark-Casey (justincc)2011-11-071-8/+6
* | Merge branch 'master' into bigmergeMelanie2011-10-263-19/+27
|\ \ | |/
| * Restart the event queue worker threads that I accidentally disabled earlier t...Justin Clark-Casey (justincc)2011-10-251-7/+9
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-253-19/+25
* | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmergeMelanie2011-10-251-12/+2
|\ \ | |/
| * Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()Justin Clark-Casey (justincc)2011-10-241-12/+2
* | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmergeMelanie2011-10-252-5/+9
|\ \ | |/
| * Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollS...Justin Clark-Casey (justincc)2011-10-242-5/+9
* | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmergeMelanie2011-10-111-1/+1
|\ \ | |/
| * Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all...Justin Clark-Casey (justincc)2011-09-301-1/+1
* | Resolve merge commits, stage 1Tom2011-09-041-57/+55
|\ \ | |/
| * read m_rpcHandlersKeepAlive under appropriate lockJustin Clark-Casey (justincc)2011-08-221-2/+4
| * oops, fix build break from last commitJustin Clark-Casey (justincc)2011-08-221-12/+8
| * improve locking of m_agentHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-10/+10
| * improve locking of m_HTTPHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-2/+2
| * improve locking of m_streamHandlers in BaseHttpServerJustin Clark-Casey (justincc)2011-08-221-2/+4