diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 82abfe9..7772f94 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2802,7 +2802,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2802 | 2802 | ||
2803 | #region Add/Remove Avatar Methods | 2803 | #region Add/Remove Avatar Methods |
2804 | 2804 | ||
2805 | public override ISceneAgent AddNewClient(IClientAPI client, PresenceType type) | 2805 | public override ISceneAgent AddNewAgent(IClientAPI client, PresenceType type) |
2806 | { | 2806 | { |
2807 | ScenePresence sp; | 2807 | ScenePresence sp; |
2808 | bool vialogin; | 2808 | bool vialogin; |
@@ -2810,7 +2810,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2810 | 2810 | ||
2811 | // Validation occurs in LLUDPServer | 2811 | // Validation occurs in LLUDPServer |
2812 | // | 2812 | // |
2813 | // XXX: A race condition exists here where two simultaneous calls to AddNewClient can interfere with | 2813 | // XXX: A race condition exists here where two simultaneous calls to AddNewAgent can interfere with |
2814 | // each other. In practice, this does not currently occur in the code. | 2814 | // each other. In practice, this does not currently occur in the code. |
2815 | AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode); | 2815 | AgentCircuitData aCircuit = m_authenticateHandler.GetAgentCircuitData(client.CircuitCode); |
2816 | 2816 | ||
@@ -2818,9 +2818,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
2818 | // and a simultaneous one that removes it (as can happen if the client is closed at a particular point | 2818 | // and a simultaneous one that removes it (as can happen if the client is closed at a particular point |
2819 | // whilst connecting). | 2819 | // whilst connecting). |
2820 | // | 2820 | // |
2821 | // It would be easier to lock across all NewUserConnection(), AddNewClient() and | 2821 | // It would be easier to lock across all NewUserConnection(), AddNewAgent() and |
2822 | // RemoveClient() calls for all agents, but this would allow a slow call (e.g. because of slow service | 2822 | // RemoveClient() calls for all agents, but this would allow a slow call (e.g. because of slow service |
2823 | // response in some module listening to AddNewClient()) from holding up unrelated agent calls. | 2823 | // response in some module listening to AddNewAgent()) from holding up unrelated agent calls. |
2824 | // | 2824 | // |
2825 | // In practice, the lock (this) in LLUDPServer.AddNewClient() currently lock across all | 2825 | // In practice, the lock (this) in LLUDPServer.AddNewClient() currently lock across all |
2826 | // AddNewClient() operations (though not other ops). | 2826 | // AddNewClient() operations (though not other ops). |
@@ -2837,7 +2837,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2837 | 2837 | ||
2838 | // XXX: Not sure how good it is to add a new client if a scene presence already exists. Possibly this | 2838 | // XXX: Not sure how good it is to add a new client if a scene presence already exists. Possibly this |
2839 | // could occur if a viewer crashes and relogs before the old client is kicked out. But this could cause | 2839 | // could occur if a viewer crashes and relogs before the old client is kicked out. But this could cause |
2840 | // other problems, and possible the code calling AddNewClient() should ensure that no client is already | 2840 | // other problems, and possibly the code calling AddNewAgent() should ensure that no client is already |
2841 | // connected. | 2841 | // connected. |
2842 | if (sp == null) | 2842 | if (sp == null) |
2843 | { | 2843 | { |
@@ -4306,7 +4306,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4306 | // We have to wait until the viewer contacts this region | 4306 | // We have to wait until the viewer contacts this region |
4307 | // after receiving the EnableSimulator HTTP Event Queue message (for the v1 teleport protocol) | 4307 | // after receiving the EnableSimulator HTTP Event Queue message (for the v1 teleport protocol) |
4308 | // or TeleportFinish (for the v2 teleport protocol). This triggers the viewer to send | 4308 | // or TeleportFinish (for the v2 teleport protocol). This triggers the viewer to send |
4309 | // a UseCircuitCode packet which in turn calls AddNewClient which finally creates the ScenePresence. | 4309 | // a UseCircuitCode packet which in turn calls AddNewAgent which finally creates the ScenePresence. |
4310 | ScenePresence sp = WaitGetScenePresence(cAgentData.AgentID); | 4310 | ScenePresence sp = WaitGetScenePresence(cAgentData.AgentID); |
4311 | 4311 | ||
4312 | if (sp != null) | 4312 | if (sp != null) |