aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs10
1 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e26283d..cd39cab 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2783,11 +2783,10 @@ namespace OpenSim.Region.Framework.Scenes
2783 { 2783 {
2784 m_scene.CrossAgentToNewRegion(this, m_physicsActor.Flying); 2784 m_scene.CrossAgentToNewRegion(this, m_physicsActor.Flying);
2785 } 2785 }
2786 catch(Exception ex) 2786 catch
2787 { 2787 {
2788 m_scene.CrossAgentToNewRegion(this, false); 2788 m_scene.CrossAgentToNewRegion(this, false);
2789 } 2789 }
2790
2791 } 2790 }
2792 2791
2793 public void InTransit() 2792 public void InTransit()
@@ -2865,7 +2864,6 @@ namespace OpenSim.Region.Framework.Scenes
2865 { 2864 {
2866 RemoveNeighbourRegion(handle); 2865 RemoveNeighbourRegion(handle);
2867 } 2866 }
2868
2869 } 2867 }
2870 2868
2871 #endregion 2869 #endregion
@@ -3026,7 +3024,7 @@ namespace OpenSim.Region.Framework.Scenes
3026 List<int> attPoints = m_appearance.GetAttachedPoints(); 3024 List<int> attPoints = m_appearance.GetAttachedPoints();
3027 if (attPoints != null) 3025 if (attPoints != null)
3028 { 3026 {
3029 m_log.DebugFormat("[SCENE PRESENCE]: attachments {0}", attPoints.Count); 3027 //m_log.DebugFormat("[SCENE PRESENCE]: attachments {0}", attPoints.Count);
3030 int i = 0; 3028 int i = 0;
3031 AttachmentData[] attachs = new AttachmentData[attPoints.Count]; 3029 AttachmentData[] attachs = new AttachmentData[attPoints.Count];
3032 foreach (int point in attPoints) 3030 foreach (int point in attPoints)
@@ -3276,9 +3274,7 @@ namespace OpenSim.Region.Framework.Scenes
3276 } 3274 }
3277 if (m_health <= 0) 3275 if (m_health <= 0)
3278 m_scene.EventManager.TriggerAvatarKill(killerObj, this); 3276 m_scene.EventManager.TriggerAvatarKill(killerObj, this);
3279 } 3277 }
3280
3281
3282 } 3278 }
3283 3279
3284 public void setHealthWithUpdate(float health) 3280 public void setHealthWithUpdate(float health)