aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * 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