diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 8defe68..d01cac2 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -872,6 +872,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
872 | 872 | ||
873 | AddToPhysicalScene(isFlying); | 873 | AddToPhysicalScene(isFlying); |
874 | 874 | ||
875 | if (m_appearance != null) | ||
876 | { | ||
877 | if (m_appearance.AvatarHeight > 0) | ||
878 | SetHeight(m_appearance.AvatarHeight); | ||
879 | } | ||
880 | |||
875 | if (m_forceFly) | 881 | if (m_forceFly) |
876 | { | 882 | { |
877 | m_physicsActor.Flying = true; | 883 | m_physicsActor.Flying = true; |
@@ -2391,11 +2397,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
2391 | if (m_appearance.Texture == null) | 2397 | if (m_appearance.Texture == null) |
2392 | return; | 2398 | return; |
2393 | 2399 | ||
2394 | if (LocalId == remoteAvatar.LocalId) | 2400 | // MT: This is needed for sit. It's legal to send it to oneself, and the name |
2395 | { | 2401 | // of the method is a misnomer |
2396 | m_log.WarnFormat("[SCENEPRESENCE]: An agent is attempting to send avatar data to itself; {0}", UUID); | 2402 | // |
2397 | return; | 2403 | // if (LocalId == remoteAvatar.LocalId) |
2398 | } | 2404 | // { |
2405 | // m_log.WarnFormat("[SCENEPRESENCE]: An agent is attempting to send avatar data to itself; {0}", UUID); | ||
2406 | // return; | ||
2407 | // } | ||
2399 | 2408 | ||
2400 | if (IsChildAgent) | 2409 | if (IsChildAgent) |
2401 | { | 2410 | { |