diff options
| author | Melanie | 2012-10-16 04:30:01 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-16 04:30:01 +0100 |
| commit | fa52effb279355ef731725c04c3b659f972f3903 (patch) | |
| tree | 7d9029b0ded43814206112d5e5b2115b9b463fc7 /OpenSim/Region/Framework | |
| parent | Fix a merge issue (diff) | |
| parent | minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now. (diff) | |
| download | opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.zip opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.tar.gz opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.tar.bz2 opensim-SC-fa52effb279355ef731725c04c3b659f972f3903.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 c8e7156..45d512b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -4345,8 +4345,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 4345 | return false; | 4345 | return false; |
| 4346 | } | 4346 | } |
| 4347 | 4347 | ||
| 4348 | // We have to wait until the viewer contacts this region after receiving EAC. | 4348 | // We have to wait until the viewer contacts this region |
| 4349 | // That calls AddNewClient, which finally creates the ScenePresence | 4349 | // after receiving the EnableSimulator HTTP Event Queue message. This triggers the viewer to send |
| 4350 | // a UseCircuitCode packet which in turn calls AddNewClient which finally creates the ScenePresence. | ||
| 4350 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); | 4351 | ScenePresence childAgentUpdate = WaitGetScenePresence(cAgentData.AgentID); |
| 4351 | 4352 | ||
| 4352 | if (childAgentUpdate != null) | 4353 | if (childAgentUpdate != null) |