Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into bigmerge | Melanie | 2011-11-28 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | ||||
| * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-11-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 1 | -1/+1 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them. Also finally get the deregister grid service message working properly | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -31/+29 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | ||||
| * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -31/+29 |
| | | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo) | ||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -13/+11 |
|\ \ | |/ | |||||
| * | minor: remove whitespace | Justin Clark-Casey (justincc) | 2011-07-13 | 1 | -1/+0 |
| | | |||||
| * | Remove an unused 404 checker since on a 404, GetResponse() throws a ↵ | Justin Clark-Casey (justincc) | 2011-07-13 | 1 | -3/+0 |
| | | | | | | | | WebException rather than proceeding. | ||||
| * | if a SynchronousRestObjectRequester request fails, then unless it's due to a ↵ | Justin Clark-Casey (justincc) | 2011-07-13 | 1 | -0/+11 |
| | | | | | | | | | | | | | | 404, log the exception for diagnostic purposes This is instead of logging "Invalid XML" for all failures, even if they weren't a result of invalid xml. A default TReponse is returned in the event of a 404, which is the same behaviour as previously. | ||||
| * | Remove the obsoleted SynchronousRestObjectPoster | Justin Clark-Casey (justincc) | 2011-07-13 | 1 | -9/+0 |
| | | |||||
* | | Dammit, loggin the type of an exception without providing the FULL DUMP is NOT | Melanie | 2011-07-10 | 1 | -0/+1 |
| | | | | | | | | going to help squash bugs! | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-20 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Changed yet more Warns to Debugs. | Diva Canto | 2011-05-14 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-14 | 1 | -3/+6 |
|\ \ | |/ | |||||
| * | Also changed a couple of messages in WebUtil from Wanr/Info to Debug. | Diva Canto | 2011-05-14 | 1 | -2/+2 |
| | | |||||
| * | Stop spamming Nebadon's console when assets aren't found in the asset server. | Diva Canto | 2011-05-14 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-13 | 1 | -9/+23 |
|\ \ | |/ | |||||
| * | Hopefully this fixes offline messages. The problem was: the server is not ↵ | Diva Canto | 2011-05-12 | 1 | -7/+2 |
| | | | | | | | | setting the ContentLength of the response. That comes up to OpenSim as ContentLength=-1, which made the existing test fail. | ||||
| * | One more thing printed out. #OfflineIM | Diva Canto | 2011-05-12 | 1 | -4/+1 |
| | | |||||
| * | Instrument the heck out of offline messages. THIS IS VERY VERBOSE. | Diva Canto | 2011-05-12 | 1 | -0/+16 |
| | | |||||
| * | One more debug message for offline IMs. | Diva Canto | 2011-05-12 | 1 | -1/+2 |
| | | |||||
| * | Sequencing the using and try clauses as they were before, but this shows ↵ | Diva Canto | 2011-05-12 | 1 | -7/+7 |
| | | | | | | | | that that obsolete function is not catching 404's as it should... | ||||
| * | Bummer, can't print the data I wanted to see. Printing just the context. | Diva Canto | 2011-05-12 | 1 | -9/+1 |
| | | |||||
| * | Tracking a problem with offline IMs coming in as null list. | Diva Canto | 2011-05-12 | 1 | -6/+19 |
| | | |||||
| * | This makes compression of fatpacks actually work. Previously they always ↵ | Diva Canto | 2011-05-11 | 1 | -7/+7 |
| | | | | | | | | failed. See comment in WebUtil. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-09 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-05-08 | 1 | -0/+5 |
| |\ | |||||
| | * | Also compress the actual fatpacks | Melanie | 2011-05-08 | 1 | -0/+5 |
| | | | |||||
| * | | Fix content-type to be application/x-www-form-urlencoded | Diva Canto | 2011-05-08 | 1 | -1/+1 |
| |/ | |||||
| * | Enable compressed (gzip) fatpack transfers. | Melanie | 2011-05-08 | 1 | -8/+35 |
| | | |||||
* | | Also compress the actual fatpacks | Melanie | 2011-05-08 | 1 | -0/+5 |
| | | |||||
* | | Enable compressed (gzip) fatpack transfers. | Melanie | 2011-05-08 | 1 | -8/+35 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-03 | 1 | -13/+8 |
|\ \ | |/ | |||||
| * | Turns out that it's a bad idea to let Agent position updates linger for a ↵ | Diva Canto | 2011-05-02 | 1 | -9/+9 |
| | | | | | | | | long time on certain versions of mono. It's better to abort them if they take too long. So timeout is now an argument. Currently: 20secs for CreateAgent, 100secs for UpdateAgent (fat), 10 secs for UpdateAgent (Position); all of these divided by 4, for ReadWrite, as Mic had before. | ||||
| * | Increased Timeout to 30 secs. | Diva Canto | 2011-04-30 | 1 | -3/+3 |
| | | |||||
| * | Removed XXX Debug. Increased ReadWriteTimeout on ServiceOSDRequest, because ↵ | Diva Canto | 2011-04-30 | 1 | -12/+3 |
| | | | | | | | | it was _way_ too low and is probably making writes abort in the middle. | ||||
| * | XXX DEBUGGING! | Diva Canto | 2011-04-30 | 1 | -1/+10 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -2/+344 |
|\ \ | |/ | |||||
| * | More descriptive debug msg for ServiceOSDRequest failures. | Dan Lake | 2011-04-16 | 1 | -2/+2 |
| | | |||||
| * | Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to ↵ | Diva Canto | 2011-04-12 | 1 | -0/+335 |
| | | | | | | | | OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd. | ||||
* | | Make the login service's call to the sim time out quicker so we have a | Melanie | 2011-03-31 | 1 | -4/+9 |
| | | | | | | | | chance to try fallback before the client quits | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-16 | 1 | -13/+7 |
|\ \ | |/ | |||||
| * | Fix and simplify QBasedComparer. | Marck | 2011-02-13 | 1 | -13/+7 |
| | | | | | | | | Make parsing of qvalues independent from a system's language setting and ensure that the comparison adheres to a descending order. | ||||
* | | Change the timeout on WebUtil to 20s to help make more tps succeed | Melanie | 2011-02-02 | 1 | -4/+4 |
|/ | |||||
* | With mic's permission, adjust long call time info messages to 500ms from 200ms | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -1/+1 |
| | |||||
* | Added more performance checks to the HTTP server. Each request | Mic Bowman | 2011-01-05 | 1 | -47/+68 |
| | | | | | 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 | ||||
* | Cleaned up debugging messages in the WebRequest handlers | Mic Bowman | 2011-01-03 | 1 | -5/+8 |
| | |||||
* | Standardize the way WebRequests are made in the SimulationServiceConnector. ↵ | Mic Bowman | 2010-12-29 | 1 | -3/+165 |
| | | | | | | Added debugging calls for tracking performance of web requests. | ||||
* | Added ability for GetTexture to serve multiple formats. The format may come ↵ | Diva Canto | 2010-12-08 | 1 | -0/+81 |
| | | | | as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>. |