diff options
| author | Diva Canto | 2011-01-06 12:47:13 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-01-06 12:47:13 -0800 |
| commit | 5b43f9cac47267a5400001445b05f137ae452ee7 (patch) | |
| tree | b27de4a73ca0ac828a9df1efae81c66773098230 /OpenSim | |
| parent | Merge branch 'master' into cmickeyb (diff) | |
| download | opensim-SC_OLD-5b43f9cac47267a5400001445b05f137ae452ee7.zip opensim-SC_OLD-5b43f9cac47267a5400001445b05f137ae452ee7.tar.gz opensim-SC_OLD-5b43f9cac47267a5400001445b05f137ae452ee7.tar.bz2 opensim-SC_OLD-5b43f9cac47267a5400001445b05f137ae452ee7.tar.xz | |
HG bug fix. Must wait for client's UDP contact before getting scene presence.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e27b2ba..12fd813 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -2592,12 +2592,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2592 | // and the scene presence and the client, if they exist | 2592 | // and the scene presence and the client, if they exist |
| 2593 | try | 2593 | try |
| 2594 | { | 2594 | { |
| 2595 | ScenePresence sp = GetScenePresence(agentID); | 2595 | // We need to wait for the client to make UDP contact first. |
| 2596 | PresenceService.LogoutAgent(sp.ControllingClient.SessionId); | 2596 | // It's the UDP contact that creates the scene presence |
| 2597 | 2597 | ScenePresence sp = WaitGetScenePresence(agentID); | |
| 2598 | if (sp != null) | 2598 | if (sp != null) |
| 2599 | sp.ControllingClient.Close(); | 2599 | { |
| 2600 | PresenceService.LogoutAgent(sp.ControllingClient.SessionId); | ||
| 2600 | 2601 | ||
| 2602 | sp.ControllingClient.Close(); | ||
| 2603 | } | ||
| 2604 | else | ||
| 2605 | { | ||
| 2606 | m_log.WarnFormat("[SCENE]: Could not find scene presence for {0}", agentID); | ||
| 2607 | } | ||
| 2601 | // BANG! SLASH! | 2608 | // BANG! SLASH! |
| 2602 | m_authenticateHandler.RemoveCircuit(agentID); | 2609 | m_authenticateHandler.RemoveCircuit(agentID); |
| 2603 | 2610 | ||