diff options
| author | Justin Clark-Casey (justincc) | 2012-10-16 01:20:41 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-10-16 01:20:41 +0100 |
| commit | d469bde849f53a4c80b301051599390e916ce08a (patch) | |
| tree | 12391802e687859a3fcfeeddaf5fcc4f1b085394 /OpenSim/Region/Framework/Scenes | |
| parent | minor: comment out "Registered seed capability" message for "Received SEED ca... (diff) | |
| download | opensim-SC_OLD-d469bde849f53a4c80b301051599390e916ce08a.zip opensim-SC_OLD-d469bde849f53a4c80b301051599390e916ce08a.tar.gz opensim-SC_OLD-d469bde849f53a4c80b301051599390e916ce08a.tar.bz2 opensim-SC_OLD-d469bde849f53a4c80b301051599390e916ce08a.tar.xz | |
minor: Add/correct some doc messages associated with entity teleport.
I believe UseCircuitCode is sent on EnableSimulator EQ message, rather than EstablishAgentCommunication
At least with LL 3.3.4, EstablishAgentCommunication appears unnecessary in the teleport context -
viewer still requests it though possibly only after TeleportFinish(). However, we will continue to send it.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index fe549bc..5f45529 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4144,8 +4144,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4144 | return false; | 4144 | return false; |
| 4145 | } | 4145 | } |
| 4146 | 4146 | ||
| 4147 | // We have to wait until the viewer contacts this region after receiving EAC. | 4147 | // We have to wait until the viewer contacts this region |
| 4148 | // That calls AddNewClient, which finally creates the ScenePresence | 4148 | // after receiving the EnableSimulator HTTP Event Queue message. This triggers the viewer to send |
| 4149 | // a UseCircuitCode packet which in turn calls AddNewClient which finally creates the ScenePresence. | ||
| 4149 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); | 4150 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); |
| 4150 | 4151 | ||
| 4151 | if (childAgentUpdate != null) | 4152 | if (childAgentUpdate != null) |