Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-06 | 1 | -1/+15 |
|\ | |||||
| * | Added more performance checks to the HTTP server. Each request | Mic Bowman | 2011-01-05 | 1 | -1/+15 |
| | | | | | | | | | | coming through the WebUtil fns has a request id in the header that can match the request to the actual work done by the service | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-21 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Shooting in the dark for solutions to the appearance problem | Mic Bowman | 2010-12-20 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | minor: remove some compiler warnings | Justin Clark-Casey (justincc) | 2010-12-10 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 1 | -0/+4 |
| |\ | |||||
| * \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | ||||
* | | | | add more detail to the log in case of FORM Timeout | sacha | 2010-12-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | cause nothing relevant are in the services logs | ||||
* | | | | Remove "OpenSimulator" from startup message | Melanie | 2010-11-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Change "OpenSim" to "Careminster" and remove CM suffix. | Melanie | 2010-11-09 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 2 | -1/+5 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Support for CORS with simple requests in BaseHttpServer | Marck | 2010-11-02 | 1 | -0/+4 |
| | |/ | |/| | |||||
| * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+2 |
| |/ | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| * | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| | | |||||
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 1 | -1/+2 |
| |\ | |||||
| * | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -5/+5 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
| * | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | * Partially complete stuff for Mesh support that Melanie wanted to see ↵ | Teravus Ovares (Dan Olivares) | 2010-10-14 | 1 | -1/+2 |
| |/ | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 1 | -16/+10 |
|\ \ | |/ | |||||
| * | Fix "show threads" to show threads now being managed by ↵ | Justin Clark-Casey (justincc) | 2010-09-14 | 1 | -16/+10 |
| | | | | | | | | OpenSim.Framework.Watchdog | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 2 | -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 Ames | 2010-09-12 | 1 | -62/+59 |
| | | |||||
| * | Remove parenthesis around the release flavour to get the version string back ↵ | Justin Clark-Casey (justincc) | 2010-09-10 | 1 | -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 break | Melanie | 2010-09-05 | 1 | -4/+0 |
| | | |||||
* | | Revert "Workaround for mono bug #312968" | Melanie Thielker | 2010-09-06 | 1 | -1/+0 |
| | | | | | | | | | | | | This reverts commit f2e343d53081dbd6956d39b1e172e171101a4900. Doesn't compile with our version of Mono. Patched Mono instead. | ||||
* | | Workaround for mono bug #312968 | Melanie Thielker | 2010-09-06 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 1 | -57/+54 |
| | | | | | | | | on IDwellModule | ||||
| * | Added XFF header processing. Untested, for lack of proxy. | Diva Canto | 2010-09-03 | 1 | -0/+2 |
| | | |||||
* | | Remove "Dwell" support from core and replace it with calls to methods | Melanie Thielker | 2010-09-05 | 1 | -58/+51 |
| | | | | | | | | on IDwellModule | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 1 | -2/+8 |
|\ \ | |/ | |||||
| * | minor: Add some method doc to BaseHttpServer.HandleRequest() | Justin Clark-Casey (justincc) | 2010-08-30 | 1 | -2/+8 |
| | | |||||
| * | Prevent an object disposed exception that made forms comms unreliable. After | Melanie Thielker | 2010-08-25 | 1 | -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 carry | Melanie Thielker | 2010-08-25 | 1 | -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. After | Melanie Thielker | 2010-08-25 | 1 | -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 carry | Melanie Thielker | 2010-08-25 | 1 | -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-refactor | Melanie | 2010-08-07 | 1 | -0/+7 |
|\ \ | |/ | |||||
| * | HACK ALERT! There's some underlying bug in the HTTP server that makes ↵ | Diva Canto | 2010-08-06 | 1 | -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-refactor | Melanie | 2010-08-06 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | comment out further debug line in BaseHttpServer | Justin Clark-Casey (justincc) | 2010-07-27 | 1 | -1/+1 |
| | | |||||
| * | do a whole load of crappy hacking to get cubes to display google.com | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -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 Grimshaw | 2010-07-10 | 1 | -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 Grimshaw | 2010-07-10 | 1 | -1/+1 |
| | | | | | | | | webserver does not report a content length (-1), but the content is still valid |