aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* More plumbing of the EntityTransferContext (not yet complete)Melanie Thielker2015-11-011-6/+6
|
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-011-5/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Framework/Servers/ServerBase.cs OpenSim/Framework/VersionInfo.cs OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs OpenSim/Region/PhysicsModules/Ode/OdeScene.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/GatekeeperService.cs OpenSim/Services/Interfaces/IAvatarService.cs OpenSim/Services/LLLoginService/LLLoginService.cs
| * Introduce an EntityTransferContext carrying the version numbers to passMelanie Thielker2015-10-311-4/+3
| | | | | | | | | | to all interested functions. Should fix the varregion conditional. Still a testing version, do NOT use in production!
| * Testing stage of the new versioning system. Use at own risk. May notMelanie Thielker2015-10-311-4/+4
| | | | | | | | work. Will eat your babies. Yada. Yada.
* | Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-081-1/+0
|\ \ | |/ | | | | | | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1
| * Deleted OpenSim.Framework.Communications. Moved its two remaining files to ↵Diva Canto2015-09-041-1/+0
| | | | | | | | OpenSim.Framework.
* | seems to compile ( tests comented out)UbitUmarov2015-09-021-14/+1
| |
* | bad merge?UbitUmarov2015-09-011-1/+14
|\ \ | |/ |/|
| * add more of the v03 checks and homeURL. Sending side only for nowUbitUmarov2015-08-261-3/+5
| |
| * Merge branch 'master' into careminsterMelanie2014-01-281-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| * \ Merge branch 'master' into careminsterMelanie2013-08-071-13/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ Merge branch 'master' into careminsterMelanie2013-07-181-37/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-06-231-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-131-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-121-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/ModuleLoader.cs OpenSim/Region/Framework/Scenes/SceneManager.cs
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-011-8/+1
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-271-4/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-231-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-05-031-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-3/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-03-101-16/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Change the QUERYACCESS method to eliminate spurious access denied messagesMelanie2011-02-161-3/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix up QueryAccess to also check parcelsMelanie2011-01-281-3/+3
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whether or not an agent is allowed there as a root agent.
| * | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-141-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix to the scenario where we send an agent to a neighbouring sim (via ↵Tom Grimshaw2010-05-181-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | | | | Partial plumbing for the agent stateful module features negotiationMelanie Thielker2015-08-201-3/+4
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Removed unused code related to DNS lookupsOren Hurvitz2015-07-231-2/+0
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Added simulation version compatibility check so that agents coming from ↵Diva Canto2014-06-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0.7.6 to a varregion running in 0.8 and above will be denied teleport, rather than be allowed and crash the viewer.
* | | | | | | | | | | | | | | Tell QueryAccess explicitly whether the user is coming in via Teleport or ↵Oren Hurvitz2014-05-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cross, because the permission checks are different. Previously we used a heuristic of checking if the entry position is 0 to differentiate between Teleport and Cross, but that doesn't work anymore since we've started providing the precise entry position for cross, too. That's required in order to ensure that the user is allowed to enter the parcel that he's walking into.
* | | | | | | | | | | | | | | In teleports, pass the source region to the destination (similar to an HTTP ↵Oren Hurvitz2014-04-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | referrer)
* | | | | | | | | | | | | | | When sending QueryAccess to a region, also send the user's Home URIOren Hurvitz2014-04-071-3/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Remove old IInterRegionComms and references. This hasn't been used since ↵Justin Clark-Casey (justincc)2014-01-161-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2009 and was superseded by ISimulationService
* | | | | | | | | | | | | Allow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to be ↵Justin Clark-Casey (justincc)2013-08-021-13/+8
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manually forced in a new [SimulationService] config setting. This is for testing and debugging purposes to help determine whether a particular issue may be teleport related or not "SIMULATION/0.2" (the newer teleport protocol) remains the default. If the source simulator only implements "SIMULATION/0.1" this will correctly allow fallback to the older protocol. Specifying "SIMULATION/0.1" will force the older, less efficient protocol to always be used.
* | | | | | | | | | | | Guard against unauthorized agent deletes.Diva Canto2013-07-131-3/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Deleted GET agent all around. Not used.Diva Canto2013-07-131-18/+0
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Change IsLocalRegion from using region handle to using regionID. This was ↵Diva Canto2013-06-221-5/+5
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.
* | | | | | | | | | Last 27 modules' directives (service connectors out).Diva Canto2012-11-131-0/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Remove any mention of IRegionModule from region names and comments to aidMelanie2012-11-121-3/+3
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | grepping for remaining uses
* | | | | | | | Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-301-8/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | It appears this was never actually used since attachments were rezzed in other code. This was never available on remote simulator comms, only local.
* | | | | | | Fix bug where a failed QueryAccess to a remove region would always have the ↵Justin Clark-Casey (justincc)2012-05-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | reason "Communications failure" no matter what the destination region actually returned
* | | | | | | Make ISimulationScene.GetScene() used the more efficient region id for ↵Justin Clark-Casey (justincc)2012-05-241-2/+2
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | lookup rather than the region handle.
* | | | | | Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-3/+3
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Check for RegionID instead of RegionHandle. Other minor tweaksDiva Canto2011-04-301-2/+2
| |_|_|/ |/| | |
* | | | Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵Diva Canto2011-04-281-3/+4
| |_|/ |/| | | | | | | | 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.
* | | Changed order of checks for local regions when processingMic Bowman2011-03-041-16/+6
| | | | | | | | | | | | | | | AgentUpdate messages. Should improve throttles and reprioritization when an avatar is moving.
* | | Change the QUERYACCESS method to eliminate spurious access denied messagesMelanie2011-02-161-3/+4
| | |
* | | Fix up QueryAccess to also check parcelsMelanie2011-01-281-3/+3
| | |
* | | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+17
| |/ |/| | | | | whether or not an agent is allowed there as a root agent.
* | Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to ↵Diva Canto2010-06-131-1/+0
|/ | | | neighbours.
generated by cgit v1.1 at 2024-09-12 15:38:02 +0000