aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-251-49/+65
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs bin/OpenSimDefaults.ini
| * Minor adjustment on timings of waits.Diva Canto2013-07-241-2/+2
| |
| * New Teleport protocol (V2), still compatible with V1 and older. (version of ↵Diva Canto2013-07-241-4/+14
| | | | | | | | | | | | | | | | the destination is being checked) In this new protocol, and as committed before, the viewer is not sent EnableSimulator/EstablishChildCommunication for the destination. Instead, it is sent TeleportFinish directly. TeleportFinish, in turn, makes the viewer send a UserCircuitCode packet followed by CompleteMovementIntoRegion packet. These 2 packets tend to occur one after the other almost immediately to the point that when CMIR arrives the client is not even connected yet and that packet is ignored (there might have been some race conditions here before); then the viewer sends CMIR again within 5-8 secs. But the delay between them may be higher in busier regions, which may lead to race conditions. This commit improves the process so there are are no race conditions at the destination. CompleteMovement (triggered by the viewer) waits until Update has been sent from the origin. Update, in turn, waits until there is a *root* scene presence -- so making sure CompleteMovement has run MakeRoot. In other words, there are two threadlets at the destination, one from the viewer and one from the origin region, waiting for each other to do the right thing. That makes it safe to close the agent at the origin upon return of the Update call without having to wait for callback, because we are absolutely sure that the viewer knows it is in th new region. Note also that in the V1 protocol, the destination was getting UseCircuitCode from the viewer twice -- once on EstablishAgentCommunication and then again on TeleportFinish. The second UCC was being ignored, but it shows how we were not following the expected steps...
| * Further tweaks on TPs: not sending the callback URL and instead waiting ↵Diva Canto2013-07-241-1/+1
| | | | | | | | | | | | 15sec before closing the agent. This seems to be working fairly well. The viewer seems to have an 8 sec delay between UseCircuitCode and CompleteMovement. Also added back the position on UpdateAgent, because it's needed for TPing between neighboring regions.
| * Amend previous commit.Diva Canto2013-07-241-4/+4
| |
| * Added config var that we all thought was already there: see_into_region. ↵Diva Canto2013-07-241-34/+45
| | | | | | | | (Note: different from the defunct see_into_neighboring_sim, which used to control the process from the other end). This enables child agents in neighbors for which the root agent doesn't have permission to be in.
* | Merge branch 'master' into careminsterMelanie2013-07-181-36/+48
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Let's go easy on authenticating ChildAgentUpdates, otherwise this will be ↵Diva Canto2013-07-141-7/+5
| | | | | | | | chaotic while ppl are using different versions of opensim. Warning only, but no enforcement.
| * Authenticate ChildAgentUpdate too.Diva Canto2013-07-141-15/+27
| |
| * Change the auth token to be the user's sessionid.Diva Canto2013-07-141-2/+2
| |
| * This should fix the failing test.Diva Canto2013-07-131-2/+1
| |
| * Deleted a line too manyDiva Canto2013-07-131-0/+3
| |
| * Guard against unauthorized agent deletes.Diva Canto2013-07-131-5/+21
| |
| * Put guards on a bunch of exception-inducing code, as seen in logs from load ↵Diva Canto2013-07-091-1/+3
| | | | | | | | test.
| * Throttle the viewer's requests for region handles. Apparently Kokua is ↵Diva Canto2013-07-041-18/+0
| | | | | | | | requesting this for all landmarks in inventory. Not sure why. But this seems to be the root cause of the login freeze mentioned before. This commit adds a blocking queue / process thread pattern.
* | Merge branch 'master' into careminsterMelanie2013-07-041-0/+1
|\ \ | |/
| * Debug the RegionHandle handler (same issue)Diva Canto2013-07-041-0/+1
| |
| * Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-061-0/+9
| | | | | | | | may yield unexpected results in some cases. No database persistence yet,
* | Merge branch 'avination-current' into careminsterMelanie2013-06-061-0/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | Unsit seated avatars when an object is deletedMelanie2013-06-021-0/+8
| | |
| * | Refactor to get closer to coreMelanie2013-05-111-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2013-06-041-0/+2
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * | Add region heartbeat start event to complement heartbeat end event.Robert Adams2013-05-301-0/+2
| | | | | | | | | | | | This allows object modification before the usual heartbeat operation.
* | | Merge branch 'master' into careminsterMelanie2013-05-301-3/+9
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * | Try caching the user name for a new agent earlier on in the process of ↵Justin Clark-Casey (justincc)2013-05-291-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | establishing a connection, to see if this helps with "Unknown UserUMMTGUN" issues. The UMMTGUN form of Unknown User seems to appear because a viewer sometimes sends a UUIDNameRequest UDP request that fails to find a binding. However, in theory the incoming agent should have made that binding before any such request is triggered. So moving this binding to an earlier point in the process to see if this makes a difference. Unknown user name is also updated to UserUMMTGUN2 - if you see the old name then you need to clear your viewer cache. This relates to http://opensimulator.org/mantis/view.php?id=6625
* | | Merge branch 'master' into careminsterMelanie2013-05-161-5/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | On closing child agents, send separate asynchronous requests to each ↵Justin Clark-Casey (justincc)2013-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | 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.
| * | On logout, send close child agent requests to neighbours asynchronously, so ↵Justin Clark-Casey (justincc)2013-05-161-6/+3
| | | | | | | | | | | | | | | | | | user is not prevented from relogging if many neighbours are present but not responsive. The symptom here is that previous user connections are still present but are labelled active == false
* | | Merge branch 'master' into careminsterMelanie2013-05-121-29/+0
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs ↵Diva Canto2013-05-111-19/+0
| | | | | | | | | | | | about who has permission to set home where.
* | | Merge branch 'master' into careminsterMelanie2013-05-111-4/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-111-2/+3
| |\ \
| | * | remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-091-2/+3
| | | |
| * | | Send up the part missing from the Avination Estate commit.Melanie2013-05-111-2/+0
| |/ / | | | | | | | | | Warning - contains a small migration.
* | | Merge branch 'master' into careminsterMelanie2013-05-081-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * | Step one of estate settings sharing - port the Avination Estate module ↵Melanie2013-05-071-2/+3
| | | | | | | | | | | | (complete module) as changes are too extensive to apply manually
* | | Merge branch 'master' into careminsterMelanie2013-05-061-5/+18
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-061-9/+102
| |\ \
| * | | Minor reordering of operations on NewUserConnection. The agent circuit needs ↵Diva Canto2013-05-061-5/+17
| | | | | | | | | | | | | | | | to be added earlier for some of the checks to work correctly.
* | | | Merge branch 'master' into careminsterMelanie2013-05-041-2/+14
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | | On startup, start scenes after we're set up all local scenes, rather than ↵Justin Clark-Casey (justincc)2013-05-031-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | starting scenes before others have been created. This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created. http://opensimulator.org/mantis/view.php?id=6618
| * | | Some more pieces of Avination's ban system - if an avatar isn't allowed on anyMelanie2013-04-291-7/+88
| |/ / | | | | | | | | | parcel in the sim, keep them out entirely.
| * | Add Avination's support for parcel eject and freezeMelanie2013-04-251-15/+25
| | |
* | | Merge branch 'master' into careminsterMelanie2013-04-101-6/+6
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * Fix taking (and rezzing) of coalesced objects in the non-root subregions of ↵Justin Clark-Casey (justincc)2013-04-061-6/+6
| | | | | | | | | | | | | | | | | | megaregions. This fixes the combined bounding box location for regions bigger than 256x256. It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead. It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region. Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595. Thanks!
* | Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminsterMelanie2013-03-291-1/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for ↵Justin Clark-Casey (justincc)2013-03-291-1/+4
| | | | | | | | | | | | | | | | scripts in attachments. This was because the script resumption in AttachmentsModule was firing the attach event instead. Had to reinstate the code in 285bd3a do we can resume the scripts there instead, though the bug existed before its removal. This is to resolve http://opensimulator.org/mantis/view.php?id=6578
* | Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminsterMelanie2013-03-291-27/+27
|\ \ | |/
| * minor: comment out unused Scene.AgentCrossing() to reduce code complexityJustin Clark-Casey (justincc)2013-03-281-27/+27
| |
* | Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminsterMelanie2013-03-291-29/+0
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
generated by cgit v1.1 at 2025-02-08 15:44:20 +0000