diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 27df3b2..f1555f7 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2979,11 +2979,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2979 | { | 2979 | { |
2980 | m_scene.CrossAgentToNewRegion(this, m_physicsActor.Flying); | 2980 | m_scene.CrossAgentToNewRegion(this, m_physicsActor.Flying); |
2981 | } | 2981 | } |
2982 | catch(Exception ex) | 2982 | catch |
2983 | { | 2983 | { |
2984 | m_scene.CrossAgentToNewRegion(this, false); | 2984 | m_scene.CrossAgentToNewRegion(this, false); |
2985 | } | 2985 | } |
2986 | |||
2987 | } | 2986 | } |
2988 | 2987 | ||
2989 | public void InTransit() | 2988 | public void InTransit() |
@@ -3061,7 +3060,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3061 | { | 3060 | { |
3062 | RemoveNeighbourRegion(handle); | 3061 | RemoveNeighbourRegion(handle); |
3063 | } | 3062 | } |
3064 | |||
3065 | } | 3063 | } |
3066 | 3064 | ||
3067 | #endregion | 3065 | #endregion |
@@ -3222,7 +3220,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3222 | List<int> attPoints = m_appearance.GetAttachedPoints(); | 3220 | List<int> attPoints = m_appearance.GetAttachedPoints(); |
3223 | if (attPoints != null) | 3221 | if (attPoints != null) |
3224 | { | 3222 | { |
3225 | m_log.DebugFormat("[SCENE PRESENCE]: attachments {0}", attPoints.Count); | 3223 | //m_log.DebugFormat("[SCENE PRESENCE]: attachments {0}", attPoints.Count); |
3226 | int i = 0; | 3224 | int i = 0; |
3227 | AttachmentData[] attachs = new AttachmentData[attPoints.Count]; | 3225 | AttachmentData[] attachs = new AttachmentData[attPoints.Count]; |
3228 | foreach (int point in attPoints) | 3226 | foreach (int point in attPoints) |
@@ -3494,9 +3492,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3494 | } | 3492 | } |
3495 | if (m_health <= 0) | 3493 | if (m_health <= 0) |
3496 | m_scene.EventManager.TriggerAvatarKill(killerObj, this); | 3494 | m_scene.EventManager.TriggerAvatarKill(killerObj, this); |
3497 | } | 3495 | } |
3498 | |||
3499 | |||
3500 | } | 3496 | } |
3501 | 3497 | ||
3502 | public void setHealthWithUpdate(float health) | 3498 | public void setHealthWithUpdate(float health) |