aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers/HttpServer (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-262-5/+11
|\ \
| * | Avoid a race condition where an incoming request to a script external URL can...Justin Clark-Casey (justincc)2012-06-222-5/+11
* | | Merge branch 'master' into careminsterMelanie2012-06-211-3/+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-13/+27
|\ \ \ | |/ /
| * | Make the "debug http" command available for robust as well as the simulator. ...Justin Clark-Casey (justincc)2012-06-151-0/+3
| * | Add main instance to internal MainServer.m_Servers list to simplify internal ...Justin Clark-Casey (justincc)2012-06-151-8/+0
| * | When setting debug http level, do this for all known http servers, not just t...Justin Clark-Casey (justincc)2012-06-151-10/+10
| * | 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
|\ \ \ | |/ /
| * | 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