aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordiva2009-02-15 05:50:07 +0000
committerdiva2009-02-15 05:50:07 +0000
commit52c5b7517404fada9cc8969de20810d54cfa2009 (patch)
tree43bbde3c42292b54c4cdef4c386c1735357d6a07 /OpenSim
parentThis started as way to correct Mantis #3158, which I believe should be fixed ... (diff)
downloadopensim-SC_OLD-52c5b7517404fada9cc8969de20810d54cfa2009.zip
opensim-SC_OLD-52c5b7517404fada9cc8969de20810d54cfa2009.tar.gz
opensim-SC_OLD-52c5b7517404fada9cc8969de20810d54cfa2009.tar.bz2
opensim-SC_OLD-52c5b7517404fada9cc8969de20810d54cfa2009.tar.xz
Moving SendInitialData sort of back to where it was before, so that it doesn't interfere with the unit tests.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a93fcb2..69397eb 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -845,7 +845,8 @@ namespace OpenSim.Region.Framework.Scenes
845 AbsolutePosition = pos; 845 AbsolutePosition = pos;
846 846
847 AddToPhysicalScene(isFlying); 847 AddToPhysicalScene(isFlying);
848 SetHeight(m_appearance.AvatarHeight); 848 if (m_appearance != null)
849 SetHeight(m_appearance.AvatarHeight);
849 850
850 // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying 851 // Don't send an animation pack here, since on a region crossing this will sometimes cause a flying
851 // avatar to return to the standing position in mid-air. On login it looks like this is being sent 852 // avatar to return to the standing position in mid-air. On login it looks like this is being sent
@@ -866,8 +867,6 @@ namespace OpenSim.Region.Framework.Scenes
866 867
867 m_isChildAgent = false; 868 m_isChildAgent = false;
868 869
869 SendInitialData();
870
871 m_scene.EventManager.TriggerOnMakeRootAgent(this); 870 m_scene.EventManager.TriggerOnMakeRootAgent(this);
872 871
873 } 872 }
@@ -1036,12 +1035,14 @@ namespace OpenSim.Region.Framework.Scenes
1036 Scene.SendReleaseAgent(m_rootRegionHandle, UUID, m_callbackURI); 1035 Scene.SendReleaseAgent(m_rootRegionHandle, UUID, m_callbackURI);
1037 m_callbackURI = null; 1036 m_callbackURI = null;
1038 } 1037 }
1039 1038
1040 //m_log.DebugFormat("Completed movement"); 1039 //m_log.DebugFormat("Completed movement");
1041 } 1040 }
1042 1041
1043 m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look); 1042 m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look);
1044 1043
1044 SendInitialData();
1045
1045 } 1046 }
1046 1047
1047 /// <summary> 1048 /// <summary>