Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-06 | 1 | -446/+111 |
|\ | |||||
| * | removed the early return on agentupdates, this was debugging code | Mic Bowman | 2011-01-04 | 1 | -1/+1 |
| | | |||||
| * | Cleaned up debugging messages in the WebRequest handlers | Mic Bowman | 2011-01-03 | 1 | -7/+7 |
| | | |||||
| * | Standardize the way WebRequests are made in the SimulationServiceConnector. ↵ | Mic Bowman | 2010-12-29 | 1 | -440/+113 |
| | | | | | | | | | | | | Added debugging calls for tracking performance of web requests. | ||||
* | | Revise Materials properties; Fix Double-Click Autopilot; Allow non-script ↵ | Kitto Flora | 2011-01-04 | 1 | -1/+1 |
| | | | | | | | | sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵ | Diva Canto | 2010-12-09 | 1 | -0/+1 |
| | | | | | | | | command. mantis #5259 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-09 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+59 |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
| * | Removed extraneous left-/ on /object/ subpath. Bug introduced during region ↵ | Diva Canto | 2010-12-07 | 1 | -1/+1 |
| | | | | | | | | URLs clean up. | ||||
* | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+59 |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -50/+7 |
|\ \ | |/ | |||||
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -0/+1 |
| |\ | |||||
| | * | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | 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 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 | -26/+26 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | ||||
* | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-11-03 | 1 | -0/+4 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Add lsClearWindlightScene() to the lightshare module to remove WL settings | Melanie | 2010-11-03 | 1 | -0/+4 |
| | |/ | |/| | | | | | | | from a region and allow normal day cycles to be reestablished | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -28/+28 |
|\ \ \ | |/ / | |||||
| * | | Change level of some logging messages, turning some info into arguably more ↵ | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -28/+28 |
| | | | | | | | | | | | | appropriate debug to reduce console spam when log level is info | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -6/+49 |
|\ \ \ | |/ / | |||||
| * | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -6/+49 |
| |/ | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| * | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 1 | -9/+1 |
| | | |||||
| * | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -40/+5 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -49/+6 |
|\ \ | |||||
| * | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 1 | -9/+1 |
| | | | |||||
| * | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -40/+5 |
| |/ | |||||
| * | Fix the above | Melanie | 2010-09-14 | 1 | -4/+3 |
| | | |||||
* | | Fix the above | Melanie | 2010-09-14 | 1 | -4/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-14 | 2 | -0/+16 |
|\ \ | |/ | |||||
| * | Allow to place the connection strings and providers for estate and region | Melanie | 2010-09-14 | 2 | -0/+16 |
| | | | | | | | | | | in their oqn sections, for those of us who don't want a catch-all DatabaseService section. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 2 | -0/+252 |
|\ \ | |/ | | | | | | | 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. | ||||
| * | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 2 | -27/+154 |
| | | | | | | | | | | * Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings | ||||
| * | Added a stub for ↵ | John Hurliman | 2010-09-12 | 1 | -0/+125 |
| | | | | | | | | OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Last+2 tweak | Diva Canto | 2010-09-03 | 1 | -1/+1 |
| | | |||||
| * | Last+1 tweak. | Diva Canto | 2010-09-03 | 1 | -1/+1 |
| | | |||||
| * | More tweaks related to my previous commit. Tweaks sux. | Diva Canto | 2010-09-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-03 | 1 | -9/+15 |
|\ \ | |/ | |||||
| * | Quick fix for making global references for gatekeepers that are not ↵ | Diva Canto | 2010-09-02 | 1 | -9/+15 |
| | | | | | | | | domain:port work. This needs a serious rewrite, as the assumption domain:port doesn't hold from here on. Just quick-fixing for now. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-21 | 1 | -27/+56 |
|\ \ | |/ | |||||
| * | Partial rewrite of client IP verification. Not completely finished yet, and ↵ | Diva Canto | 2010-08-19 | 1 | -27/+56 |
| | | | | | | | | untested. Committing to move to my other computer. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Increased the timeout on AgentUpdate to 30 sec and improved error message to ↵ | Diva Canto | 2010-08-16 | 1 | -2/+2 |
| | | | | | | | | try to catch some weirdnesses going on in HG TPs (and maybe non-HG TPs too). | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-14 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to ↵ | Diva Canto | 2010-06-13 | 1 | -1/+1 |
| | | | | | | | | neighbours. | ||||
* | | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot ↵ | Tom Grimshaw | 2010-05-29 | 1 | -2/+6 |
| | | | | | | | | be resolved, and add some handlers to deal with this cleanly; a condition was observed on OSGrid where a neighbouring region with an invalid (unresolveable) hostname would prevent a region from starting. This is bad. | ||||
* | | Fix to the scenario where we send an agent to a neighbouring sim (via ↵ | Tom Grimshaw | 2010-05-18 | 1 | -1/+13 |
|/ | | | | teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it. | ||||
* | Get the local inner simulation service object to the handler so that there ↵ | Diva Canto | 2010-03-15 | 1 | -0/+5 |
| | | | | is no possibility of cascading requests when failures happen. |