Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 1 | -3/+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 | -2/+6 |
| | | | | | | | | | | | | | | 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-11-17 | 1 | -79/+0 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
| * | Removed unused and mostly commented out SceneCommunicationService methods | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -80/+1 |
| | | | | | | | | As far as I can see, the SCS is only now used for informing neighbours of up/down status and possibly sending child agent updates and close requests | ||||
| * | Remove unused RegionCommsListener/IRegionCommsListener. | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -3/+0 |
| | | | | | | | | All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time. | ||||
| * | remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -5/+0 |
| | | | | | | | | not being used any more - it's now IEntityTransferModule and SimulationService instead | ||||
| * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 1 | -4/+0 |
| | | | | | | | | packet per prim. More to come as we change to make use of this. | ||||
* | | Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Refactored "known child region" in ScenePresence. There were 4 different | Dan Lake | 2011-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | ways to access the list/dictionary of child regions and locking was inconsistent. There are now public properties which enforce locks. Callers are no longer required to create new copies of lists. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -21/+22 |
|\ \ | |/ | | | | | | | | | | | | | | | 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 | -21/+22 |
| | | | | | | | | | | | | 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. | ||||
| * | A bit more frugal on the caller side of closing agents, now that the ↵ | Diva Canto | 2011-01-07 | 1 | -16/+20 |
| | | | | | | | | receiving end is async. No need for so much concurrency. | ||||
| * | Fix child agent scoping | Melanie | 2011-01-03 | 1 | -4/+4 |
| | | |||||
* | | Fix child agent scoping | Melanie | 2010-12-31 | 1 | -4/+4 |
| | | |||||
* | | Make SendKillObject send multiple localIDs in one packet. This avoids the | Melanie | 2010-10-08 | 1 | -4/+0 |
| | | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -3/+3 |
| | | |||||
* | | removing more stains ... | sacha | 2010-08-07 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-14 | 1 | -14/+7 |
|\ \ | |/ | |||||
| * | Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to ↵ | Diva Canto | 2010-06-13 | 1 | -14/+7 |
| | | | | | | | | neighbours. | ||||
* | | Fix to the scenario where we send an agent to a neighbouring sim (via ↵ | Tom Grimshaw | 2010-05-18 | 1 | -1/+1 |
| | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-04 | 1 | -7/+7 |
|\ \ | |/ | |||||
| * | minor: remove some compiler warnings | Justin Clark-Casey (justincc) | 2010-03-03 | 1 | -7/+7 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 1 | -1219/+10 |
|\ \ | |/ | | | | | This brings careminster on the level of master. To be tested | ||||
| * | * Removed the unused GridRegion.getInternalEndPointPort() (just use ↵ | John Hurliman | 2010-02-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | InternalEndPoint.Port). This class is complex enough as it is * Changed the failed to inform neighbor message from a warning to info, since this will fire for every empty neighbor space * Made the EnableSimulator/EstablishAgentCommunication log message more verbose and more clear about what is happening | ||||
| * | Merge branch 'master' into presence-refactor | Melanie | 2010-01-16 | 1 | -6/+1 |
| |\ | | | | | | | | | | | | | This merge was very conflicted. I think I got them all, but I can't be sure. I had to merge to master or risk divergence to the point of unmergeability. | ||||
| * | | * General cleanup of Teleports, Crossings and Child agents. They are now in ↵ | Diva Canto | 2010-01-15 | 1 | -1149/+0 |
| | | | | | | | | | | | | | | | | | | | | | the new AgentTransferModule, in line with what MW started implementing back in May -- ITeleportModule. This has been renamed IAgentTransferModule, to be more generic. * HGSceneCommunicationService has been deleted * SceneCommunicationService will likely be deleted soon too | ||||
| * | | Bug in Teleport fixed -- Appearance was missing from AgentCircuitData. | Diva Canto | 2010-01-13 | 1 | -0/+1 |
| | | | |||||
| * | | Several more buglets removed. | Diva Canto | 2010-01-13 | 1 | -16/+13 |
| | | | |||||
| * | | More appearance woes fixed, this time for child agents. Tested on a grid ↵ | Diva Canto | 2010-01-12 | 1 | -0/+4 |
| | | | | | | | | | | | | with 2 simulators. Everything seems to be working, including border crosses. TPs (prim crossing) need love now. | ||||
| * | | Fixed a couple of bugs with Appearance. Appearance is all good now. | Diva Canto | 2010-01-11 | 1 | -2/+2 |
| | | | |||||
| * | | OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. | Diva Canto | 2010-01-11 | 1 | -1/+0 |
| | | | |||||
| * | | CommunicationsManager deleted. | Diva Canto | 2010-01-11 | 1 | -3/+1 |
| | | | |||||
| * | | CommunicationsManager is practically empty. Only NetworkServersInfo is there. | Diva Canto | 2010-01-10 | 1 | -6/+1 |
| | | | |||||
| * | | * Changed IPresenceService Logout, so that it takes a position and a lookat | Diva Canto | 2010-01-10 | 1 | -13/+0 |
| | | | | | | | | | | | | * CommsManager.AvatarService rerouted | ||||
| * | | * OMG! All but one references to UserProfileCacheService have been rerouted! | Diva Canto | 2010-01-10 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | * HG is seriously broken here * Compiles. Untested. | ||||
| * | | A few more inches... Old friends things removed. Less references to ↵ | Diva Canto | 2010-01-08 | 1 | -19/+0 |
| | | | | | | | | | | | | UserProfileService. | ||||
| * | | Inching ahead... This compiles, but very likely does not run. | Diva Canto | 2010-01-08 | 1 | -5/+0 |
| | | | |||||
| * | | * Finished SimulationServiceConnector | Diva Canto | 2010-01-07 | 1 | -14/+20 |
| | | | | | | | | | | | | | | | * Started rerouting calls to UserService. * Compiles. May run. | ||||
* | | | Disable blocking teleports within the same parcel for now; it's not ↵ | CasperW | 2010-02-25 | 1 | -2/+4 |
| | | | | | | | | | | | | implemented correctly. Will review soon. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2010-02-08 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | Add EventManager.OnIncomingSceneObject event which is triggered by an ↵ | Justin Clark-Casey (justincc) | 2010-02-08 | 1 | -1/+0 |
| | |/ | |/| | | | | | | | | | | | | | incoming scene object Add a read-only Attachments property to ScenePresence | ||||
* | | | Line endings cleanup | Melanie | 2010-02-04 | 1 | -36/+36 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2010-01-10 | 1 | -7/+0 |
|\ \ \ | |/ / | |||||
| * | | Remove "login disable", "login enable" and "login status" commands. | Melanie | 2010-01-10 | 1 | -7/+0 |
| |/ | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-29 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Change teleports so the TeleportFlags are sent to the destination sim. It | Melanie | 2009-12-29 | 1 | -2/+2 |
| | | | | | | | | | | can now determine if a connection is from login, teleport or crossing. Needed for a meaningful banlines implementation | ||||
* | | Fix for landing points. Only one scenario is not fully covered by this ↵ | CasperW | 2009-12-26 | 1 | -11/+36 |
|/ | | | | change, and that is people who teleport from neighbouring regions, who won't get affected by the landing point. | ||||
* | Getting rid of SimpleRegionInfo and SerializableRegionInfo per Mel | Kunnis | 2009-12-12 | 1 | -33/+4 |
| | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | Remove the old remoting-type interregion code for prim/script crossing | Melanie | 2009-11-26 | 1 | -72/+0 |
| |