Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-02-23 | 1 | -1/+2 |
|\ | | | | | | | | | 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 | -1/+2 |
| | | | | | | | | | | | | 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 careminster | Melanie | 2012-02-20 | 1 | -6/+17 |
|\ \ | |/ | |||||
| * | Amend to last commit: synchronize access to queues. | Diva Canto | 2012-02-20 | 1 | -2/+5 |
| | | |||||
| * | More improvements on agent position updates: if the target sims fail, ↵ | Diva Canto | 2012-02-20 | 1 | -6/+14 |
| | | | | | | | | blacklist them for 2 min, so that we don't keep doing remote calls that fail. | ||||
* | | Prevent object loss and positioning outside the region with failed object sim | Melanie | 2012-02-14 | 1 | -1/+4 |
| | | | | | | | | crossings | ||||
* | | 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 commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+6 |
|\ \ | |/ | |||||
| * | Reattaching a region was failing if the estate name had not changed (issue ↵ | Kevin Houlihan | 2011-09-16 | 1 | -1/+6 |
| | | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -6/+21 |
|\ \ | |/ | |||||
| * | Fixed an issue with the response of CreateAgent over the SimulationConnector. | Diva Canto | 2011-05-28 | 1 | -6/+21 |
| | | |||||
| * | Also compress the actual fatpacks | Melanie | 2011-05-08 | 1 | -1/+6 |
| | | |||||
| * | Enable compressed (gzip) fatpack transfers. | Melanie | 2011-05-08 | 1 | -5/+14 |
| | | |||||
* | | Also compress the actual fatpacks | Melanie | 2011-05-08 | 1 | -1/+6 |
| | | |||||
* | | Enable compressed (gzip) fatpack transfers. | Melanie | 2011-05-08 | 1 | -5/+14 |
| | | |||||
* | | Attempt to make teleports more reliable. This may break redirection on login | Melanie | 2011-05-03 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-03 | 1 | -16/+19 |
|\ \ | |/ | |||||
| * | Increased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien ↵ | Diva Canto | 2011-05-02 | 1 | -1/+1 |
| | | | | | | | | avatar takes 6secs to transfer between sims on the same machine... | ||||
| * | Turns out that it's a bad idea to let Agent position updates linger for a ↵ | Diva Canto | 2011-05-02 | 1 | -7/+7 |
| | | | | | | | | 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. | ||||
| * | Fixed confusing OSDMap that comes as the response of QueryAccess in the case ↵ | Diva Canto | 2011-05-01 | 1 | -9/+12 |
| | | | | | | | | it fails. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 1 | -7/+12 |
|\ \ | |/ | |||||
| * | Minor improvement in version checking (Simulation service) | Diva Canto | 2011-04-29 | 1 | -1/+1 |
| | | |||||
| * | Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵ | Diva Canto | 2011-04-28 | 1 | -7/+12 |
| | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-06 | 1 | -0/+5 |
|\ \ | |/ | |||||
| * | Make the "All Estates" option work from the client (this makes chosen ↵ | Justin Clark-Casey (justincc) | 2011-04-05 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | changes to all the estates that the user owns). This applies to adding/removing estate users, groups, managers and bans. This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420 Thanks very much, Snoopy! | ||||
* | | Make the login service's call to the sim time out quicker so we have a | Melanie | 2011-03-31 | 1 | -1/+1 |
| | | | | | | | | chance to try fallback before the client quits | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 1 | -0/+10 |
|\ \ | |/ | |||||
| * | On initial region registration, if the user chooses the option to make the ↵ | Justin Clark-Casey (justincc) | 2011-03-21 | 1 | -0/+10 |
| | | | | | | | | region part of an existing estate, then list the existing region names. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-10 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Add log messages on teleport failure to better pin down the cause. | Justin Clark-Casey (justincc) | 2011-03-09 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-19 | 1 | -2/+6 |
|\ \ | |/ | |||||
| * | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-02-18 | 1 | -1/+1 |
| | | |||||
| * | Fix bug introduced by Query Access. The response does not come in a packaged ↵ | Diva Canto | 2011-02-16 | 1 | -5/+5 |
| | | | | | | | | | | | | _Result field, it comes as simple OSDMap with 2 fields in it. Also in this commit: comment out irrelevant debug message on AuthService. | ||||
| * | Change the QUERYACCESS method to eliminate spurious access denied messages | Melanie | 2011-02-16 | 1 | -1/+16 |
| | | |||||
* | | Change the QUERYACCESS method to eliminate spurious access denied messages | Melanie | 2011-02-16 | 1 | -1/+16 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -3/+52 |
|\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs | ||||
| * | Change UpdateAgent (for changes in agent position) to be sent | Mic Bowman | 2011-02-03 | 1 | -3/+52 |
| | | | | | | | | | | | | once to each simulator rather than once to each region. This should help with some of the delays caused by multiple outstanding requests to a single service point. | ||||
| * | Make the new style stuff compatible with the older revision | Melanie | 2011-01-28 | 1 | -1/+14 |
| | | |||||
| * | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 1 | -3/+7 |
| | | |||||
* | | Make the new style stuff compatible with the older revision | Melanie | 2011-01-28 | 1 | -1/+14 |
| | | |||||
* | | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 1 | -3/+7 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 3 | -9/+9 |
|\ \ | |/ | |||||
| * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 3 | -9/+9 |
| | | |||||
* | | 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 |
|\ \ | |/ |