aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-181-58/+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/+3
| |
| * Deleted GET agent all around. Not used.Diva Canto2013-07-131-35/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-06-231-9/+22
|\ \ | |/ | | | | | | | | | | | | 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
| * Change IsLocalRegion from using region handle to using regionID. This was ↵Diva Canto2013-06-221-1/+1
| | | | | | | | affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.
| * Finally moved HG agent transfers to use agent fatpacks.Diva Canto2013-06-211-8/+21
| |
* | Merge branch 'master' into careminsterMelanie2012-12-091-1/+1
|\ \ | |/
| * Trying to prevent old route of sending attachments, simulator version ↵Diva Canto2012-12-061-1/+1
| | | | | | | | unknown maybe due to timeout. mantis #6450
* | Make friend notifies and closing child agents async because both canMelanie2012-09-041-10/+11
| | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive
* | Add a reason message for a code path that lacks oneMelanie2012-08-031-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-05-271-14/+25
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix bug where a failed QueryAccess to a remove region would always have the ↵Justin Clark-Casey (justincc)2012-05-251-13/+20
| | | | | | | | reason "Communications failure" no matter what the destination region actually returned
| * In remote QueryAccess, also receive the actual status (true|false) instead ↵Justin Clark-Casey (justincc)2012-05-251-0/+4
| | | | | | | | | | | | | | | | | | | | of always true no matter what the callee actually returned. This was due to two things 1) SimulationServiceConnector.QueryAccess was always looking to the outer result["success"]. But if a "_Result" map is returned (which is certainly the case right now), then the true success is _Result["success"], result["success"] is always true no matter what 2) If QueryAccess was false at the destination, then AgentHandlers.DoQueryAccess() was never putting this in the result. The default action of SerializeJsonString() is not to put false booleans in the JSON!!!, so this has to be explicitly set.
| * Make ISimulationScene.GetScene() used the more efficient region id for ↵Justin Clark-Casey (justincc)2012-05-241-1/+1
| | | | | | | | lookup rather than the region handle.
* | Merge branch 'master' into careminsterMelanie2012-02-231-1/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-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 careminsterMelanie2012-02-201-6/+17
|\ \ | |/
| * Amend to last commit: synchronize access to queues.Diva Canto2012-02-201-2/+5
| |
| * More improvements on agent position updates: if the target sims fail, ↵Diva Canto2012-02-201-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 simMelanie2012-02-141-1/+4
| | | | | | | | crossings
* | Merge branch 'master' into bigmergeMelanie2011-11-191-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-191-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 branch 'master' into careminster-presence-refactorMelanie2011-06-091-6/+21
|\ \ | |/
| * Fixed an issue with the response of CreateAgent over the SimulationConnector.Diva Canto2011-05-281-6/+21
| |
| * Also compress the actual fatpacksMelanie2011-05-081-1/+6
| |
| * Enable compressed (gzip) fatpack transfers.Melanie2011-05-081-5/+14
| |
* | Also compress the actual fatpacksMelanie2011-05-081-1/+6
| |
* | Enable compressed (gzip) fatpack transfers.Melanie2011-05-081-5/+14
| |
* | Attempt to make teleports more reliable. This may break redirection on loginMelanie2011-05-031-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-031-16/+19
|\ \ | |/
| * Increased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien ↵Diva Canto2011-05-021-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 Canto2011-05-021-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 Canto2011-05-011-9/+12
| | | | | | | | it fails.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-7/+12
|\ \ | |/
| * Minor improvement in version checking (Simulation service)Diva Canto2011-04-291-1/+1
| |
| * Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵Diva Canto2011-04-281-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.
* | Make the login service's call to the sim time out quicker so we have aMelanie2011-03-311-1/+1
| | | | | | | | chance to try fallback before the client quits
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-101-3/+3
|\ \ | |/
| * Add log messages on teleport failure to better pin down the cause.Justin Clark-Casey (justincc)2011-03-091-3/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-191-2/+6
|\ \ | |/
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-02-181-1/+1
| |
| * Fix bug introduced by Query Access. The response does not come in a packaged ↵Diva Canto2011-02-161-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 messagesMelanie2011-02-161-1/+16
| |
* | Change the QUERYACCESS method to eliminate spurious access denied messagesMelanie2011-02-161-1/+16
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-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 sentMic Bowman2011-02-031-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 revisionMelanie2011-01-281-1/+14
| |
| * Fix up QueryAccess to also check parcelsMelanie2011-01-281-3/+7
| |
* | Make the new style stuff compatible with the older revisionMelanie2011-01-281-1/+14
| |
* | Fix up QueryAccess to also check parcelsMelanie2011-01-281-3/+7
| |
generated by cgit v1.1 at 2024-12-24 00:25:52 +0000