aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-181-12/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * Guard against unauthorized agent deletes.Diva Canto2013-07-131-4/+4
| |
* | Merge branch 'master' into careminsterMelanie2013-06-071-1/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Fix regression where multiple close agents could be sent to the wrong ↵Justin Clark-Casey (justincc)2013-06-071-1/+6
| | | | | | | | | | | | | | | | neighbour region on root agent close. This was introduced in git master d214e2d0 (Thu May 16 17:12:02 2013) Caught out by the fact that value types used in iterators act like references and this was dispatched asynchronously. Should address http://opensimulator.org/mantis/view.php?id=6658
| * On closing child agents, send separate asynchronous requests to each ↵Justin Clark-Casey (justincc)2013-05-161-3/+1
| | | | | | | | | | | | | | neighbour rather than sending all closes concurrently on a separate thread. This is to reduce race conditions where neighbours may be responding erratically, thus mixing up create and close agent requests in time. This mirrors OpenSimulator behaviour on enabling child agents where each region is contacted separately.
* | Merge branch 'master' into careminsterMelanie2012-07-191-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Missing parameter in log error message was throwing exceptionDan Lake2012-07-181-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-07-131-5/+17
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Don't cache regions data on the other unused LocalGridServiceConnector that ↵Justin Clark-Casey (justincc)2012-07-131-5/+17
| | | | | | | | | | | | the module code still sets up even if we're using one directly instantiated from the RemoteGridServiceConnector. Also improves log messages to indicate which regions are sending/receiving various neighbour protocol messages.
* | Merge branch 'master' into careminsterMelanie2012-06-081-4/+4
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Fix bug with "kick user" reducing agent counts by 2 instead of 1.Justin Clark-Casey (justincc)2012-06-081-6/+5
| | | | | | | | | | This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close() DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient()
* | Merge branch 'master' into careminsterMelanie2012-04-091-1/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IScriptModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Addresses mantis #5846Diva Canto2012-04-081-1/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-02-241-2/+2
|\ \ | |/
| * Take watchdog alarm calling back outside the m_threads lock.Justin Clark-Casey (justincc)2012-02-241-2/+2
| | | | | | | | This is how it was originally. This stops a very long running alarm callback from causing a problem.
* | Merge branch 'master' into careminsterMelanie2012-02-201-5/+2
|\ \ | |/
| * More improvements on agent position updates: if the target sims fail, ↵Diva Canto2012-02-201-5/+2
| | | | | | | | blacklist them for 2 min, so that we don't keep doing remote calls that fail.
* | Merge branch 'master' into careminsterMelanie2012-02-191-6/+13
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * A few more tweaks on position updates and create child agents. Mono hates ↵Diva Canto2012-02-191-6/+13
| | | | | | | | concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours.
| * Changed the async approach on close child agents. This may improve crossings ↵Diva Canto2011-12-161-6/+3
| | | | | | | | a little bit.
* | Merge branch 'master' into bigmergeMelanie2011-11-191-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-191-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 bigmergeMelanie2011-11-171-79/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Removed unused and mostly commented out SceneCommunicationService methodsJustin Clark-Casey (justincc)2011-11-151-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-151-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-151-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 oneMelanie2011-11-061-4/+0
| | | | | | | | packet per prim. More to come as we change to make use of this.
* | Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmergeMelanie2011-10-121-1/+1
|\ \ | |/
| * Refactored "known child region" in ScenePresence. There were 4 differentDan Lake2011-10-061-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-refactorMelanie2011-02-071-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 sentMic Bowman2011-02-031-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 Canto2011-01-071-16/+20
| | | | | | | | receiving end is async. No need for so much concurrency.
| * Fix child agent scopingMelanie2011-01-031-4/+4
| |
* | Fix child agent scopingMelanie2010-12-311-4/+4
| |
* | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-081-4/+0
| | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-301-3/+3
|\ \ | |/
| * Remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-261-3/+3
| |
* | removing more stains ...sacha2010-08-071-3/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-141-14/+7
|\ \ | |/
| * Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to ↵Diva Canto2010-06-131-14/+7
| | | | | | | | neighbours.
* | Fix to the scenario where we send an agent to a neighbouring sim (via ↵Tom Grimshaw2010-05-181-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-refactorMelanie2010-03-041-7/+7
|\ \ | |/
| * minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-03-031-7/+7
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-031-1219/+10
|\ \ | |/ | | | | This brings careminster on the level of master. To be tested
| * * Removed the unused GridRegion.getInternalEndPointPort() (just use ↵John Hurliman2010-02-231-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-refactorMelanie2010-01-161-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 Canto2010-01-151-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 Canto2010-01-131-0/+1
| | |
| * | Several more buglets removed.Diva Canto2010-01-131-16/+13
| | |
| * | More appearance woes fixed, this time for child agents. Tested on a grid ↵Diva Canto2010-01-121-0/+4
| | | | | | | | | | | | with 2 simulators. Everything seems to be working, including border crosses. TPs (prim crossing) need love now.
generated by cgit v1.1 at 2024-12-25 03:50:18 +0000