aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-141-16/+10
|\
| * Fix "show threads" to show threads now being managed by ↵Justin Clark-Casey (justincc)2010-09-141-16/+10
| | | | | | | | OpenSim.Framework.Watchdog
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-132-63/+60
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * 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
| | | | | | | | | | | | under 27 chars Can't quite remember why this has to be <=27 chars, maybe something to do with the space available for the version string in a typical client
| * Fix build breakMelanie2010-09-051-4/+0
| |
* | Revert "Workaround for mono bug #312968"Melanie Thielker2010-09-061-1/+0
| | | | | | | | | | | | This reverts commit f2e343d53081dbd6956d39b1e172e171101a4900. Doesn't compile with our version of Mono. Patched Mono instead.
* | 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
| | | | | | | | on IDwellModule
| * 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
| | | | | | | | on IDwellModule
* | 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
| | | | | | | | | | starting an asynchronous write, one should not close the channel it will be written to synchrnously, that leads to grief.
| * Change some e.Message to e.ToString. Don't use e.Message, it doesn't carryMelanie Thielker2010-08-251-2/+2
| | | | | | | | | | any useful information. Error messages are useless without location information. It looks more elegant, but is totally pointless.
* | Prevent an object disposed exception that made forms comms unreliable. AfterMelanie Thielker2010-08-251-2/+7
| | | | | | | | | | starting an asynchronous write, one should not close the channel it will be written to synchrnously, that leads to grief.
* | Change some e.Message to e.ToString. Don't use e.Message, it doesn't carryMelanie Thielker2010-08-251-2/+2
| | | | | | | | | | any useful information. Error messages are useless without location information. It looks more elegant, but is totally pointless.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-071-0/+7
|\ \ | |/
| * HACK ALERT! There's some underlying bug in the HTTP server that makes ↵Diva Canto2010-08-061-0/+7
| | | | | | | | requests come up with Accept headers from previous requests. Until that gets fixed, this hack goes in.
* | 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
| | | | | | | | | | | | currently, for smoe reason the page only appears when you click a face. also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason you can still change the url and normal navigation will work again
* | Fix the synchronousrestformsrequester so it will successfully handle a ↵Tom Grimshaw2010-07-101-1/+1
| | | | | | | | response from a server which does not provide a valid content length header
* | Fix an issue where the SynchronousRestObjectRequester will fail if a ↵Tom Grimshaw2010-07-101-1/+1
| | | | | | | | webserver does not report a content length (-1), but the content is still valid
* | 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 ↵Tom Grimshaw2010-07-031-1/+16
| | | | | | | | 100 seconds.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-251-1/+1
|\ \ | |/
| * fix web request exception reporting properly this timeJustin Clark-Casey (justincc)2010-06-251-1/+1
| |
| * Revert "Report http server onRequest() exception properly."Justin Clark-Casey (justincc)2010-06-251-1/+1
| | | | | | | | This reverts commit c09451a034babe6de7a2ffec44852a19946ec76d.
| * Report http server onRequest() exception properly.Justin Clark-Casey (justincc)2010-06-251-1/+1
| |
| * Readjust master version and flavorMelanie2010-06-151-2/+2
| |
| * Change flavor to 0.7-RC1Melanie2010-06-121-2/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-1/+1
|\ \ | | | | | | | | | 0.7.1CM Dev
| * | Change trunk versio to 0.7.1 DevMelanie2010-06-121-2/+2
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-281-1/+5
|\ \ | |/
| * add a smidgen more log debug information in the form of the operating system ↵Justin Clark-Casey (justincc)2010-05-281-1/+5
| | | | | | | | version
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-161-48/+0
|\ \ | |/
| * delete now unused MessageServerInfoJustin Clark-Casey (justincc)2010-05-151-48/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-271-1/+1
|\ \ | |/
| * Better error message.Diva Canto2010-04-261-1/+1
| |
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-131-1/+1
|\ \
| * | Test commitMelanie Thielker2010-04-051-1/+1
| | |
| * | Bump version numberMelanie Thielker2010-04-051-1/+1
| | |
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-051-0/+1
|\ \ \ | |/ /
| * | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-051-0/+1
| |\ \
| | * | switch flavor to RC1Justin Clark-Casey (justincc)2010-03-261-1/+1
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-302-4/+2
|\ \ \ \ | | |_|/ | |/| |