aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDiva Canto2013-07-22 22:00:20 -0700
committerDiva Canto2013-07-24 14:30:13 -0700
commit4e5c7bdeb3222edeff8fbf8c01ce0b5916473e46 (patch)
tree520a625e027a619f42152f7fa435d072ae31075e /OpenSim/Region/Framework
parentOne more thing to test in order to let CompleteMovement go up the stack. (diff)
downloadopensim-SC_OLD-4e5c7bdeb3222edeff8fbf8c01ce0b5916473e46.zip
opensim-SC_OLD-4e5c7bdeb3222edeff8fbf8c01ce0b5916473e46.tar.gz
opensim-SC_OLD-4e5c7bdeb3222edeff8fbf8c01ce0b5916473e46.tar.bz2
opensim-SC_OLD-4e5c7bdeb3222edeff8fbf8c01ce0b5916473e46.tar.xz
Moved TriggerOnMakeRootAgent back to the end of MakeRootAgent, to see if that eliminates the temporary placement at infinity upon TPs
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs9
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7f24174..f9190d9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1013,9 +1013,8 @@ namespace OpenSim.Region.Framework.Scenes
1013 // recorded, which stops the input from being processed. 1013 // recorded, which stops the input from being processed.
1014 MovementFlag = 0; 1014 MovementFlag = 0;
1015 1015
1016 // DIVA NOTE: I moved TriggerOnMakeRootAgent out of here and into the end of 1016 m_scene.EventManager.TriggerOnMakeRootAgent(this);
1017 // CompleteMovement. We don't want modules doing heavy computation before CompleteMovement 1017
1018 // is over.
1019 } 1018 }
1020 1019
1021 public int GetStateSource() 1020 public int GetStateSource()
@@ -1437,10 +1436,6 @@ namespace OpenSim.Region.Framework.Scenes
1437// "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 1436// "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms",
1438// client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds); 1437// client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
1439 1438
1440 // DIVA NOTE: moved this here from MakeRoot. We don't want modules making heavy
1441 // computations before CompleteMovement is over
1442 m_scene.EventManager.TriggerOnMakeRootAgent(this);
1443
1444 } 1439 }
1445 1440
1446 /// <summary> 1441 /// <summary>