From 56497c9615b48f271f5315376e76348bdc41745c Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 27 Apr 2008 18:35:00 +0000 Subject: Minor svn, formatting cleanup. --- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 4 - prebuild.xml | 105 ++++++++++----------- 2 files changed, 50 insertions(+), 59 deletions(-) diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 6a56204..0849698 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -884,12 +884,10 @@ namespace OpenSim.Region.Environment.Scenes if (m_physicsActor == null) { AddToPhysicalScene(); - } m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight); m_parentPosition = new LLVector3(); - m_parentID = 0; SendFullUpdateToAllClients(); @@ -897,7 +895,6 @@ namespace OpenSim.Region.Environment.Scenes if (m_physicsActor != null) { SetHeight(m_avHeight); - } } @@ -985,7 +982,6 @@ namespace OpenSim.Region.Environment.Scenes StandUp(); } - SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); if (part != null) diff --git a/prebuild.xml b/prebuild.xml index 5fc0a42..bcef1cd 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -34,25 +34,25 @@ @@ -196,7 +196,6 @@ - @@ -224,7 +223,7 @@ - + @@ -495,7 +494,6 @@ - @@ -867,8 +865,7 @@ - - + ../../../../bin/ @@ -897,8 +894,7 @@ - - + ../../../../../../bin/Terrain/ @@ -919,8 +915,7 @@ - - + ../../../../bin/ @@ -942,8 +937,8 @@ - - + + @@ -1101,7 +1096,7 @@ - + @@ -1115,32 +1110,32 @@ - - - ../../../bin/ - - - - - ../../../bin/ - - + + + ../../../bin/ + + + + + ../../../bin/ + + - ../../../bin/ - - - - - - - - - - - - - - + ../../../bin/ + + + + + + + + + + + + + + -- cgit v1.1