Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-03-14 | 1 | -7/+12 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Minor sanity check on simulation agent handler (content type) | Diva Canto | 2012-03-13 | 1 | -7/+12 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-23 | 1 | -3/+7 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | ||||
| * | Add a position parameter to region crossing of objects. This avoids the | Melanie | 2012-02-23 | 1 | -3/+7 |
| | | | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵ | Justin Clark-Casey (justincc) | 2011-12-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 1 | -4/+3 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -2/+2 |
| | | | | | | | | | | | | | | SendCreateChildAgent" message This is misleading since a simulator will call this method before successfully trying remote regions. Also comments out spammy "[SIMULATION]: Stream handler called" AgentHandlers messages for now. | ||||
| * | Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -2/+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 careminster-presence-refactor | Melanie | 2011-05-13 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | This makes compression of fatpacks actually work. Previously they always ↵ | Diva Canto | 2011-05-11 | 1 | -3/+2 |
| | | | | | | | | failed. See comment in WebUtil. | ||||
| * | Revert "Functional improvement: close the stream. Non-functional: add debug ↵ | Diva Canto | 2011-05-11 | 1 | -19/+2 |
| | | | | | | | | | | | | messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs." This reverts commit 5548f837501184d68c352097ad1a1de566e18ca0. | ||||
| * | One more debug message. Don't use this unless your name is nebadon. | Diva Canto | 2011-05-11 | 1 | -0/+3 |
| | | |||||
| * | Functional improvement: close the stream. Non-functional: add debug messages ↵ | Diva Canto | 2011-05-11 | 1 | -2/+19 |
| | | | | | | | | to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs. | ||||
| * | Also compress the actual fatpacks | Melanie | 2011-05-08 | 2 | -94/+171 |
| | | |||||
| * | Remove a spammy debug I left in. Disable TP cancel button at the point | Melanie | 2011-05-08 | 1 | -1/+0 |
| | | | | | | | | of no return. | ||||
| * | Enable compressed (gzip) fatpack transfers. | Melanie | 2011-05-08 | 2 | -131/+191 |
| | | |||||
* | | Also compress the actual fatpacks | Melanie | 2011-05-08 | 2 | -94/+171 |
| | | |||||
* | | Remove a spammy debug I left in. Disable TP cancel button at the point | Melanie | 2011-05-08 | 1 | -1/+0 |
| | | | | | | | | of no return. | ||||
* | | Enable compressed (gzip) fatpack transfers. | Melanie | 2011-05-08 | 2 | -131/+191 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -3/+6 |
|\ \ | |/ | |||||
| * | Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵ | Diva Canto | 2011-04-28 | 1 | -3/+6 |
| | | | | | | | | the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service. | ||||
| * | Change the QUERYACCESS method to eliminate spurious access denied messages | Melanie | 2011-02-16 | 1 | -2/+9 |
| | | |||||
* | | Change the QUERYACCESS method to eliminate spurious access denied messages | Melanie | 2011-02-16 | 1 | -2/+9 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-12 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | Comment previous debug | Diva Canto | 2011-02-08 | 1 | -3/+3 |
| | | |||||
| * | XFF header again -- debug. | Diva Canto | 2011-02-08 | 1 | -0/+5 |
| | | |||||
| * | Fix a typo in the QUERYACCESS method name | Melanie | 2011-02-05 | 1 | -1/+1 |
| | | |||||
| * | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 1 | -1/+8 |
| | | |||||
* | | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 1 | -1/+8 |
| | | |||||
* | | Make bans work for teleport. Now teleport will complete block if the user | Melanie | 2011-01-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | is not allowed on the estate. If the user is allowed on no parcel, the teleport will also be blocked. If the user is allowed on a parcel, but not the desired one, the user will be shifted to the closest allowed location. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-23 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | remove some mono compiler warnings and unnecessary dictionary instantiations | Justin Clark-Casey (justincc) | 2011-01-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 1 | -4/+13 |
|\ \ | |/ | |||||
| * | Account for some component along the way lower-casing the HTTP header keys. ↵ | Diva Canto | 2011-01-17 | 1 | -13/+10 |
| | | | | | | | | (XFF header issue) | ||||
| * | Brute force debug for XFF issue | Diva Canto | 2011-01-17 | 1 | -0/+7 |
| | | |||||
| * | More debug messages to help track the XFF header problem. | Diva Canto | 2011-01-17 | 1 | -0/+3 |
| | | |||||
| * | Improved debug messages to track what is going on with the XFF header | Diva Canto | 2011-01-09 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-09 | 1 | -20/+31 |
|\ \ | |/ | |||||
| * | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+26 |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
| * | Added an exception handler on CreateObject handler, just in case there's an ↵ | Diva Canto | 2010-12-07 | 1 | -20/+31 |
| | | | | | | | | exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs) | ||||
| * | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -1/+6 |
| | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | ||||
* | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+26 |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
* | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -1/+6 |
| | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 1 | -1/+21 |
|\ \ | |/ | |||||
| * | Made the Gatekeeper proxy-able. | Diva Canto | 2010-10-03 | 1 | -1/+21 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-05 | 1 | -18/+1 |
|\ \ | |/ | |||||
| * | Make User Agent Service and Login Service separable. | Diva Canto | 2010-09-04 | 1 | -18/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 1 | -0/+20 |
|\ \ | |/ | |||||
| * | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 1 | -0/+20 |
| | | | | | | | | untested. Committing to move to my other computer. |