aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "start sending terrain in scenePresence after well defined avatar. Minor"UbitUmarov2014-08-041-2/+2
| | | | This reverts commit 05a2feba5d780c57c252891a20071800fd9f2e3e.
* start sending terrain in scenePresence after well defined avatar. MinorUbitUmarov2014-08-041-2/+2
| | | | change on significante AgentUpdate check.
* replace debug msgs by othersUbitUmarov2014-08-031-5/+5
|
* several debug msgs, need to be removed asapUbitUmarov2014-08-031-0/+7
|
* dont standup avatar on crossingUbitUmarov2014-07-261-2/+2
|
* Merge branch 'master' into careminsterMelanie2014-01-281-27/+35
|\ | | | | | | | | | | | | | | 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 'justincc-master'Justin Clark-Casey (justincc)2014-01-201-15/+35
| |\
| | * Stop exceptions being generated on agent connection if a telehub object has ↵Justin Clark-Casey (justincc)2014-01-201-15/+35
| | | | | | | | | | | | been deleted or has no spawn points.
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-161-12/+0
| |\ \ | | |/
| | * Remove old IInterRegionComms and references. This hasn't been used since ↵Justin Clark-Casey (justincc)2014-01-161-12/+0
| | | | | | | | | | | | 2009 and was superseded by ISimulationService
* | | Intermediate commit. Sill errors.Melanie2014-01-051-0/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| * | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-041-0/+5
| |/ | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs
* | Merge branch 'master' into careminsterMelanie2013-10-041-48/+45
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in ↵Justin Clark-Casey (justincc)2013-09-271-6/+6
| | | | | | | | the code that this is symmetric with CloseAgent()
| * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-271-13/+13
| | | | | | | | | | | | it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. Adds IScene.CloseAgent() to replace RemoveClient()
| * Reinsert client.SceneAgent checks into ↵Justin Clark-Casey (justincc)2013-09-251-0/+3
| | | | | | | | | | | | | | | | LLUDPServer.HandleCompleteMovementIntoRegion() to fix race condition regression in commit 7dbc93c (Wed Sep 18 21:41:51 2013 +0100) This check is necessary to close a race condition where the CompleteAgentMovement processing could proceed when the UseCircuitCode thread had added the client to the client manager but before the ScenePresence had registered to process the CompleteAgentMovement message. This is most probably why the message appeared to get lost on a proportion of entity transfers. A better long term solution may be to set the IClientAPI.SceneAgent property before the client is added to the manager.
| * Change some message log levels in Scene.IncomingUpdateChildAgent() for ↵Justin Clark-Casey (justincc)2013-09-201-3/+3
| | | | | | | | debugging purposes
| * Revert "Also check user authorization if looking to upgrade from a child to ↵Justin Clark-Casey (justincc)2013-09-191-13/+0
| | | | | | | | | | | | | | a root agent." This reverts commit c7ded0618c303f8c24a91c83c2129292beebe466. This proves not to be necessary - the necessary checks are already being done via QueryAccess() before cross or teleport
| * Create regression TestCrossOnSameSimulatorNoRootDestPerm() to check that ↵Justin Clark-Casey (justincc)2013-09-191-1/+2
| | | | | | | | avatars are not allowed to cross into a neighbour where they are not authorized, even if a child agent was allowed.
| * refactor: rename *ChildAgentDataUpdate() methods to *UpdateChildAgent()Justin Clark-Casey (justincc)2013-09-181-4/+4
| | | | | | | | verb-noun is consistent with other similar methods
| * minor: Make log message when Scene.IncomingChildAgentDateUpdate() more ↵Justin Clark-Casey (justincc)2013-09-181-3/+8
| | | | | | | | | | | | | | explicit that there is a problem if it still finds the agent to be a child if the sender wanted to wait till it became root Add some comments about the mssage sequence, though much more data is at http://opensimulator.org/wiki/Teleports
* | Merge branch 'avination-current' into careminsterMelanie2013-09-161-2/+4
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
| * | Fix the root cause of keyframe motion region crossing offset - UpdateSceneObjectMelanie2013-08-251-2/+4
| | | | | | | | | | | | was being called twice on each crossing.
* | | Merge branch 'master' into careminsterMelanie2013-09-071-10/+72
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Restore group membership check for HG users in QueryAccess.Diva Canto2013-09-051-5/+1
| | |
| * | Also check user authorization if looking to upgrade from a child to a root ↵Justin Clark-Casey (justincc)2013-09-041-0/+13
| | | | | | | | | | | | | | | | | | agent. Relevant if a child agent has been allowed into the region which should not be upgraded to a root agent.
| * | For a Hypergrid user, delay estate access checks until NewUserConnection() ↵Justin Clark-Casey (justincc)2013-09-041-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that they work. This is necessary because the hypergrid groups checks (as referenced by estates) require an agent circuit to be present to construct the hypergrid ID. However, this is not around until Scene.NewUserConnection(), as called by CreateAgent() in EntityTransferModule. Therefore, if we're dealing with a hypergrid user, delay the check until NewUserConnection()/CreateAgent() The entity transfer impact should be minimal since CreateAgent() is the next significant call after NewUserConnection() However, to preserve the accuracy of query access we will only relax the check for HG users.
| * | Fix bug where users teleporting to non-neighbour regions could continue to ↵Justin Clark-Casey (justincc)2013-09-021-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | hear chat from their source region for some time after teleport completion. This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat. This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running. This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
| * | Comment out warning about agent updating without valid session ID for now.Justin Clark-Casey (justincc)2013-09-021-4/+4
| | | | | | | | | | | | This causes extreme console spam if a simulator running latest master and one running 0.7.5 have adjacent regions occupied by avatars.
* | | Merge branch 'master' into careminsterMelanie2013-09-011-3/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | Potential fix for access control bug on login introduced with SeeIntoRegion ↵Diva Canto2013-08-241-1/+1
| | | | | | | | | | | | commit.
| * | Stop error messages being misleadingly generated when on client connection ↵Justin Clark-Casey (justincc)2013-08-221-2/+19
| | | | | | | | | | | | | | | | | | activity timeout, a root connection triggers a CloseAgent to a neighbour region which has already closed the agent due to inactivity. Also separates out log messages to distinguish between close not finding an agent and wrong auth token, and downgrades former to debug and latter to warn
* | | Merge branch 'master' into careminsterMelanie2013-08-171-11/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| * | Rely on the Scene.IncomingCloseAgent() check as to whether the connection ↵Justin Clark-Casey (justincc)2013-08-151-1/+1
| | | | | | | | | | | | | | | | | | should be kept open after teleport-end rather than doing this in the ET Module This is safer since the close check in IncomingCloseAgent() is done under lock conditions, which prevents a race between ETM and Scene.AddClient()
| * | Do not use the SP.DoNotCloseAfterTeleport flag for child agent connections.Justin Clark-Casey (justincc)2013-08-151-11/+20
| | | | | | | | | | | | | | | | | | | | | This approach has problems if a client quits without sending a proper logout but then reconnects before the connection is closed due to inactivity. In this case, the DoNotCloseAfterTeleport was wrongly set. The simplest approach is to close child agents on teleport as quickly as possible so that races are very unlikely to occur Hence, this code now closes child agents as the first action after a sucessful teleport.
* | | Merge branch 'master' into careminsterMelanie2013-08-141-0/+12
|\ \ \ | |/ /
| * | Add method doc to Scene.RemoveClient() to ask any callers to use ↵Justin Clark-Casey (justincc)2013-08-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Scene.IncomingCloseAgent() instead. IncomingCloseAgent() now sets the scene presence state machine properly, which is necessary to avoid races between multiple sources of close. Hence, it's also necessary for everyone to consistently call IncomingCloseAgent() Calling RemoveClient() directly is currently generating an attention-grabbing exception though this right now this is harmless.
* | | Merge branch 'master' into careminsterMelanie2013-08-111-130/+232
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Merge branch 'TeleportWork'Justin Clark-Casey (justincc)2013-08-091-111/+203
| |\ \
| | * | Fix an issue with an A->C->B->A teleport where these regions are in a row ↵Justin Clark-Casey (justincc)2013-08-091-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (A,B,C) where the A root agent is still closed, terminating the connection. This was occuring because teleport to B did not set DoNotCloseAfterTeleport on A as it was a neighbour (where it isn't set to avoid the issue where the source region doesn't send Close() to regions that are still neighbours (hence not resetting DoNotCloseAfterTeleport). Fix here is to still set DoNotCloseAfterTeleport if scene presence is still registered as in transit from A
| | * | Fix an issue where under teleport v2 protocol, teleporting from regions in ↵Justin Clark-Casey (justincc)2013-08-081-112/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an line from A->B->C would not close region A when reaching C The root cause was that v2 was only closing neighbour agents if the root connection also needed a close. However, fixing this requires the neighbour regions also detect when they should not close due to re-teleports re-establishing the child connection. This involves restructuring the code to introduce a scene presence state machine that can serialize the different add and remove client calls that are now possible with the late close of the This commit appears to fix these issues and improve teleport, but still has holes on at least quick reteleporting (and possibly occasionally on ordinary teleports). Also, has not been completely tested yet in scenarios where regions are running on different simulators
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-08-091-10/+16
| |\ \ \ | | |/ /
| * | | Go easy on enforcing session ids in position updatesDiva Canto2013-08-091-16/+17
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-08-071-26/+33
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | minor: add some method doc to ScenePresence fields used for entity transfer, ↵Justin Clark-Casey (justincc)2013-08-071-10/+16
| |/ / | | | | | | | | | | | | | | | add minor details to some log messages, rename a misleading local variable name. No functional changes.
| * | Fixed incomplete commit r/23317 -- see_into_region. Put the guard around ↵Diva Canto2013-08-071-16/+16
| | | | | | | | | | | | estate bans also, and delete the obsolete config var.
* | | Merge branch 'master' into careminsterMelanie2013-07-291-50/+37
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Comment debug messageDiva Canto2013-07-261-2/+2
| | |
| * | This should fix all issues with teleports. One should be able to TP as fast ↵Diva Canto2013-07-251-32/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | as needed. (Although sometimes Justin's state machine kicks in and doesn't let you) The EventQueues are a hairy mess, and it's very easy to mess things up. But it looks like this commit makes them work right. Here's what's going on: - Child and root agents are only closed after 15 sec, maybe - If the user comes back, they aren't closed, and everything is reused - On the receiving side, clients and scene presences are reused if they already exist - Caps are always recreated (this is where I spent most of my time!). It turns out that, because the agents carry the seeds around, the seed gets the same URL, except for the root agent coming back to a far away region, which gets a new seed (because we don't know what was its seed in the departing region, and we can't send it back to the client when the agent returns there).
| * | Reset DoNotClose scene presence teleport flag before pausing. Rename ↵Justin Clark-Casey (justincc)2013-07-261-1/+1
| | | | | | | | | | | | DoNotClose to DoNotCloseAfterTeleport
generated by cgit v1.1 at 2024-12-26 16:10:50 +0000