diff options
| author | Justin Clark-Casey (justincc) | 2010-06-08 15:50:21 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-06-08 15:50:21 +0100 |
| commit | a160b44e0766329a6c336adcb804cede39e00fc7 (patch) | |
| tree | edf6d5070a0bb9dcba424cf883fe20a7c96af751 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |
| parent | If a transfer request is received for a task inventory item asset, then route... (diff) | |
| parent | minor: remove some commented out code and return ScenePresence.UpdatePriority... (diff) | |
| download | opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.zip opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.gz opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.bz2 opensim-SC-a160b44e0766329a6c336adcb804cede39e00fc7.tar.xz | |
Merge branch '0.6.9-post-fixes' into share-with-group
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 2f6a0db..67fa13d 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
| @@ -1383,7 +1383,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1383 | // now we have a child agent in this region. Request all interesting data about other (root) agents | 1383 | // now we have a child agent in this region. Request all interesting data about other (root) agents |
| 1384 | agent.SendInitialFullUpdateToAllClients(); | 1384 | agent.SendInitialFullUpdateToAllClients(); |
| 1385 | 1385 | ||
| 1386 | // Console.WriteLine("SCS 1"); | ||
| 1386 | agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true); | 1387 | agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true); |
| 1388 | // Console.WriteLine("SCS 2"); | ||
| 1387 | 1389 | ||
| 1388 | // m_scene.SendKillObject(m_localId); | 1390 | // m_scene.SendKillObject(m_localId); |
| 1389 | 1391 | ||