aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorJeff Ames2008-04-27 18:35:00 +0000
committerJeff Ames2008-04-27 18:35:00 +0000
commit56497c9615b48f271f5315376e76348bdc41745c (patch)
tree9da5d83ccaee7172b5b33932ba7bba5853bf1372 /OpenSim/Region/Environment/Scenes
parent* More attachment stuff, reworked some of the inventory routines to be what I... (diff)
downloadopensim-SC_OLD-56497c9615b48f271f5315376e76348bdc41745c.zip
opensim-SC_OLD-56497c9615b48f271f5315376e76348bdc41745c.tar.gz
opensim-SC_OLD-56497c9615b48f271f5315376e76348bdc41745c.tar.bz2
opensim-SC_OLD-56497c9615b48f271f5315376e76348bdc41745c.tar.xz
Minor svn, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs4
1 files changed, 0 insertions, 4 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
884 if (m_physicsActor == null) 884 if (m_physicsActor == null)
885 { 885 {
886 AddToPhysicalScene(); 886 AddToPhysicalScene();
887
888 } 887 }
889 888
890 m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight); 889 m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight);
891 m_parentPosition = new LLVector3(); 890 m_parentPosition = new LLVector3();
892
893 891
894 m_parentID = 0; 892 m_parentID = 0;
895 SendFullUpdateToAllClients(); 893 SendFullUpdateToAllClients();
@@ -897,7 +895,6 @@ namespace OpenSim.Region.Environment.Scenes
897 if (m_physicsActor != null) 895 if (m_physicsActor != null)
898 { 896 {
899 SetHeight(m_avHeight); 897 SetHeight(m_avHeight);
900
901 } 898 }
902 } 899 }
903 900
@@ -985,7 +982,6 @@ namespace OpenSim.Region.Environment.Scenes
985 StandUp(); 982 StandUp();
986 } 983 }
987 984
988
989 SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); 985 SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
990 986
991 if (part != null) 987 if (part != null)