aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
authorMelanie2010-06-07 05:23:52 +0100
committerMelanie2010-06-07 05:23:52 +0100
commitcc2622660bad93ef46844476e434b6640a3a3643 (patch)
treeaa0b0f36bcbfb9bd44fe396e1cd98f8de26f2255 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
parentGosh, fixing another nullref issue in cmGetAvatarList. I deserve spanks. (diff)
parentRevert "commit code which stops full updates being fired multiple times when ... (diff)
downloadopensim-SC-cc2622660bad93ef46844476e434b6640a3a3643.zip
opensim-SC-cc2622660bad93ef46844476e434b6640a3a3643.tar.gz
opensim-SC-cc2622660bad93ef46844476e434b6640a3a3643.tar.bz2
opensim-SC-cc2622660bad93ef46844476e434b6640a3a3643.tar.xz
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 9153069..04626d3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1410,9 +1410,7 @@ namespace OpenSim.Region.Framework.Scenes
1410 // now we have a child agent in this region. Request all interesting data about other (root) agents 1410 // now we have a child agent in this region. Request all interesting data about other (root) agents
1411 agent.SendInitialFullUpdateToAllClients(); 1411 agent.SendInitialFullUpdateToAllClients();
1412 1412
1413 Console.WriteLine("SCS 1");
1414 agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true); 1413 agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true);
1415 Console.WriteLine("SCS 2");
1416 1414
1417 // m_scene.SendKillObject(m_localId); 1415 // m_scene.SendKillObject(m_localId);
1418 1416