aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-132-63/+60
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-09-121-62/+59
| * Remove parenthesis around the release flavour to get the version string back ...Justin Clark-Casey (justincc)2010-09-101-1/+1
| * Fix build breakMelanie2010-09-051-4/+0
* | Revert "Workaround for mono bug #312968"Melanie Thielker2010-09-061-1/+0
* | Workaround for mono bug #312968Melanie Thielker2010-09-061-0/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-051-0/+2
|\ \ | |/
| * Remove "Dwell" support from core and replace it with calls to methodsMelanie Thielker2010-09-051-57/+54
| * Added XFF header processing. Untested, for lack of proxy.Diva Canto2010-09-031-0/+2
* | Remove "Dwell" support from core and replace it with calls to methodsMelanie Thielker2010-09-051-58/+51
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-031-2/+8
|\ \ | |/
| * minor: Add some method doc to BaseHttpServer.HandleRequest()Justin Clark-Casey (justincc)2010-08-301-2/+8
| * Prevent an object disposed exception that made forms comms unreliable. AfterMelanie Thielker2010-08-251-2/+7
| * Change some e.Message to e.ToString. Don't use e.Message, it doesn't carryMelanie Thielker2010-08-251-2/+2
* | Prevent an object disposed exception that made forms comms unreliable. AfterMelanie Thielker2010-08-251-2/+7
* | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carryMelanie Thielker2010-08-251-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-071-0/+7
|\ \ | |/
| * HACK ALERT! There's some underlying bug in the HTTP server that makes request...Diva Canto2010-08-061-0/+7
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-061-1/+1
|\ \ | |/
| * comment out further debug line in BaseHttpServerJustin Clark-Casey (justincc)2010-07-271-1/+1
| * do a whole load of crappy hacking to get cubes to display google.comJustin Clark-Casey (justincc)2010-07-261-1/+1
* | Fix the synchronousrestformsrequester so it will successfully handle a respon...Tom Grimshaw2010-07-101-1/+1
* | Fix an issue where the SynchronousRestObjectRequester will fail if a webserve...Tom Grimshaw2010-07-101-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-07-081-2/+13
|\ \ | |/
| * Handle a specific exception without spewing red ink.Melanie2010-07-081-2/+13
* | Correct positioning of timeout modifier in the SynchronousRestObjectRequesterTom Grimshaw2010-07-041-1/+1
* | Implement a timeout value in the SynchronousRestObjectRequester. Default is 1...Tom Grimshaw2010-07-031-1/+16