aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authordiva2009-02-15 20:02:13 +0000
committerdiva2009-02-15 20:02:13 +0000
commit312b0f91c4d86787684a46bcd28ee45b431ba9b1 (patch)
treeecb0960a60d386b3d90d53ea129906367611d200 /OpenSim/Region/Framework/Scenes
parentFix exception when standing up. (diff)
downloadopensim-SC_OLD-312b0f91c4d86787684a46bcd28ee45b431ba9b1.zip
opensim-SC_OLD-312b0f91c4d86787684a46bcd28ee45b431ba9b1.tar.gz
opensim-SC_OLD-312b0f91c4d86787684a46bcd28ee45b431ba9b1.tar.bz2
opensim-SC_OLD-312b0f91c4d86787684a46bcd28ee45b431ba9b1.tar.xz
More guards around SetHeight.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0aac6e1..42a429d 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1480,7 +1480,7 @@ namespace OpenSim.Region.Framework.Scenes
1480 m_parentID = 0; 1480 m_parentID = 0;
1481 SendFullUpdateToAllClients(); 1481 SendFullUpdateToAllClients();
1482 m_requestedSitTargetID = 0; 1482 m_requestedSitTargetID = 0;
1483 if (m_physicsActor != null) 1483 if ((m_physicsActor != null) && (m_avHeight > 0))
1484 { 1484 {
1485 SetHeight(m_avHeight); 1485 SetHeight(m_avHeight);
1486 } 1486 }
@@ -2241,7 +2241,8 @@ namespace OpenSim.Region.Framework.Scenes
2241 AddToPhysicalScene(m_physicsActor.Flying); 2241 AddToPhysicalScene(m_physicsActor.Flying);
2242 } 2242 }
2243 m_appearance.SetAppearance(texture, visualParam); 2243 m_appearance.SetAppearance(texture, visualParam);
2244 SetHeight(m_appearance.AvatarHeight); 2244 if (m_appearance.AvatarHeight > 0)
2245 SetHeight(m_appearance.AvatarHeight);
2245 m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance); 2246 m_scene.CommsManager.AvatarService.UpdateUserAppearance(m_controllingClient.AgentId, m_appearance);
2246 2247
2247 SendAppearanceToAllOtherAgents(); 2248 SendAppearanceToAllOtherAgents();