diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 24a92eb..8fae032 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3369,11 +3369,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3369 | 3369 | ||
3370 | public void SendTerseUpdateToAgentClient(ScenePresence p) | 3370 | public void SendTerseUpdateToAgentClient(ScenePresence p) |
3371 | { | 3371 | { |
3372 | // messy checks because a client doesn't know what presence it belongs too | ||
3373 | |||
3374 | IClientAPI remoteClient = p.ControllingClient; | 3372 | IClientAPI remoteClient = p.ControllingClient; |
3375 | if (remoteClient == null) | ||
3376 | return; | ||
3377 | 3373 | ||
3378 | if (!remoteClient.IsActive) | 3374 | if (!remoteClient.IsActive) |
3379 | return; | 3375 | return; |
@@ -3381,7 +3377,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
3381 | if (ParcelHideThisAvatar && p.currentParcelUUID != currentParcelUUID && p.GodLevel < 200) | 3377 | if (ParcelHideThisAvatar && p.currentParcelUUID != currentParcelUUID && p.GodLevel < 200) |
3382 | return; | 3378 | return; |
3383 | 3379 | ||
3384 | |||
3385 | //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity); | 3380 | //m_log.DebugFormat("[SCENE PRESENCE]: " + Name + " sending TerseUpdate to " + remoteClient.Name + " : Pos={0} Rot={1} Vel={2}", m_pos, Rotation, m_velocity); |
3386 | remoteClient.SendEntityUpdate( | 3381 | remoteClient.SendEntityUpdate( |
3387 | this, | 3382 | this, |
@@ -3507,7 +3502,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3507 | // If we aren't using a cached appearance, then clear out the baked textures | 3502 | // If we aren't using a cached appearance, then clear out the baked textures |
3508 | if (!cachedappearance) | 3503 | if (!cachedappearance) |
3509 | { | 3504 | { |
3510 | Appearance.ResetAppearance(); | 3505 | // Appearance.ResetAppearance(); |
3511 | // save what ???? | 3506 | // save what ???? |
3512 | // maybe needed so the tryretry repair works? | 3507 | // maybe needed so the tryretry repair works? |
3513 | if (m_scene.AvatarFactory != null) | 3508 | if (m_scene.AvatarFactory != null) |
@@ -3530,7 +3525,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3530 | // send even grays | 3525 | // send even grays |
3531 | if (cachedappearance) | 3526 | if (cachedappearance) |
3532 | { | 3527 | { |
3533 | m_log.DebugFormat("[SCENE PRESENCE]: Baked textures are in the cache for {0} in {1}", Name, m_scene.Name); | 3528 | // m_log.DebugFormat("[SCENE PRESENCE]: Baked textures are in the cache for {0} in {1}", Name, m_scene.Name); |
3534 | // If the avatars baked textures are all in the cache, then we have a | 3529 | // If the avatars baked textures are all in the cache, then we have a |
3535 | // complete appearance... send it out, if not, then we'll send it when | 3530 | // complete appearance... send it out, if not, then we'll send it when |
3536 | // the avatar finishes updating its appearance | 3531 | // the avatar finishes updating its appearance |