aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-03-311-1/+2
|\ \ | |/
| * Add Extended flavour option to opensim version information.Justin Clark-Casey (justincc)2012-03-301-1/+2
* | Merge branch 'master' into careminsterMelanie2012-03-181-6/+10
|\ \ | |/
| * minor: reuse threadpool count we just fetched instead of fetching it againJustin Clark-Casey (justincc)2012-03-161-1/+1
| * Add total scripts count to "show threads"Justin Clark-Casey (justincc)2012-03-161-2/+10
| * Improve threadpool reporting to "show threads" console command (also gets pri...Justin Clark-Casey (justincc)2012-03-161-6/+2
* | Merge branch 'master' into careminsterMelanie2012-03-081-10/+10
|\ \ | |/
| * Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-081-10/+10
* | Merge branch 'master' into careminsterMelanie2012-03-031-1/+1
|\ \ | |/
| * Flick master up to 0.7.4Justin Clark-Casey (justincc)2012-02-291-1/+1
* | Merge branch 'master' into careminsterMelanie2012-02-242-1/+3
|\ \ | |/
| * Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ...Justin Clark-Casey (justincc)2012-02-241-1/+1
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-0/+2
* | Merge branch 'master' into careminsterMelanie2012-02-181-1/+3
|\ \ | |/
| * On Windows automatically load the correct native ODE library depending on whe...Justin Clark-Casey (justincc)2012-02-181-1/+3
* | Merge branch 'master' into careminsterMelanie2012-01-311-1/+1
|\ \ | |/
| * Use Environment.TickCount & Int32.MaxValue; instead of Util.EnvironmentTickCo...Justin Clark-Casey (justincc)2012-01-311-1/+1
* | 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-0512-15/+210
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ...Justin Clark-Casey (justincc)2011-12-0512-15/+210
* | 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-172-3/+21
|\ \ | |/
| * fix build break on UserManagementModule.Justin Clark-Casey (justincc)2011-11-151-4/+8
| * improve formatting of "show threads"Justin Clark-Casey (justincc)2011-11-151-1/+8
| * send a watchdog heartbeat for a poll worker thread when it's actually runJustin Clark-Casey (justincc)2011-11-151-0/+3
| * Add number of milliseconds since last update to "show threads"Justin Clark-Casey (justincc)2011-11-151-3/+7
* | 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-265-19/+138
|\ \ | |/
| * Restart the event queue worker threads that I accidentally disabled earlier t...Justin Clark-Casey (justincc)2011-10-251-7/+9