aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-04-173-460/+0
|\
| * Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to Open...Diva Canto2011-04-123-445/+0
| * Revert master version number to 0.7.1 for now to make merging easier.Justin Clark-Casey (justincc)2011-04-071-1/+1
| * bump main branch version number to 0.7.2. A separate 0.7.1-post-fixes branch...Justin Clark-Casey (justincc)2011-04-061-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-212-2/+2
|\ \ | |/
| * Thanks Kevin Cozens for a patch that:BlueWall2011-03-171-1/+1
| * minor: bring comment into line with code realityJustin Clark-Casey (justincc)2011-03-161-1/+1
| * Up the timeout on slow requests to 3000 to stop console spam. Make sureMelanie2011-03-141-5/+21
* | Up the timeout on slow requests to 3000 to stop console spam. Make sureMelanie2011-03-141-5/+21
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-101-1/+0
|\ \ | |/
| * Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.Justin Clark-Casey (justincc)2011-03-091-1/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-191-1/+13
|\ \ | |/
| * XFF capitalization strikes again -- this time in the XMLRPC method. mantis #5386Diva Canto2011-02-161-1/+13
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-0/+32
|\ \ | |/
| * Added a couple of console commands to help diagnose issues:Diva Canto2011-02-051-0/+32
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-12/+15
|\ \ | |/
| * Fix "set log level" to once again display current log level if it's not given...Justin Clark-Casey (justincc)2011-02-041-12/+15
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-232-8/+33
|\ \ | |/
| * Update the "config get <section> <key>" command to "config get [<section>] [<...Justin Clark-Casey (justincc)2011-01-211-0/+14
| * make "show info" and "show version" show the same version textJustin Clark-Casey (justincc)2011-01-211-4/+7
| * add current console log level to "show info"Justin Clark-Casey (justincc)2011-01-211-2/+9
| * minor: make "show info" help slightly clearerJustin Clark-Casey (justincc)2011-01-201-1/+1
| * With mic's permission, adjust long call time info messages to 500ms from 200msJustin Clark-Casey (justincc)2011-01-191-2/+3
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-061-1/+15
|\ \ | |/
| * Added more performance checks to the HTTP server. Each requestMic Bowman2011-01-051-1/+15
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-2/+2
|\ \ | |/
| * Shooting in the dark for solutions to the appearance problemMic Bowman2010-12-201-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-121-1/+1
|\ \ | |/
| * minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-12-101-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-2/+2
|\ \ | |/
| * Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-051-0/+4
| |\
| * \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-1/+1
| |\ \
* | | | add more detail to the log in case of FORM Timeoutsacha2010-12-041-1/+1
* | | | Remove "OpenSimulator" from startup messageMelanie2010-11-091-1/+1
* | | | Change "OpenSim" to "Careminster" and remove CM suffix.Melanie2010-11-091-2/+2
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-022-1/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Support for CORS with simple requests in BaseHttpServerMarck2010-11-021-0/+4
| | |/ | |/|
| * | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-301-1/+1
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-231-2/+2
|\ \ \ | |/ /
| * | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-221-2/+2
| |/
| * * remove some spurious debug infoJonathan Freedman2010-10-201-5/+5
| * Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-171-1/+2
| |\
| * | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-021-5/+5
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-2/+2
|\ \ \
| * | | * remove some spurious debug infoJonathan Freedman2010-10-201-5/+5
| * | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-201-5/+5
| | |/ | |/|
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-161-1/+2
|\ \ \ | |/ /
| * | * Partially complete stuff for Mesh support that Melanie wanted to see before...Teravus Ovares (Dan Olivares)2010-10-141-1/+2
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-141-16/+10
|\ \ | |/
| * Fix "show threads" to show threads now being managed by OpenSim.Framework.Wat...Justin Clark-Casey (justincc)2010-09-141-16/+10