OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor svn, formatting cleanup.

0.6.0-stable
Jeff Ames 2008-04-27 18:35:00 +00:00
parent f71871bca3
commit 56497c9615
2 changed files with 50 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -884,20 +884,17 @@ namespace OpenSim.Region.Environment.Scenes
if (m_physicsActor == null) if (m_physicsActor == null)
{ {
AddToPhysicalScene(); AddToPhysicalScene();
} }
m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight); m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight);
m_parentPosition = new LLVector3(); m_parentPosition = new LLVector3();
m_parentID = 0; m_parentID = 0;
SendFullUpdateToAllClients(); SendFullUpdateToAllClients();
if (m_physicsActor != null) if (m_physicsActor != null)
{ {
SetHeight(m_avHeight); SetHeight(m_avHeight);
} }
} }
@ -985,7 +982,6 @@ namespace OpenSim.Region.Environment.Scenes
StandUp(); StandUp();
} }
SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
if (part != null) if (part != null)

5
prebuild.xml
View File

@ -196,7 +196,6 @@
</Files> </Files>
</Project> </Project>
<Project name="OpenSim.Data" path="OpenSim/Data" type="Library"> <Project name="OpenSim.Data" path="OpenSim/Data" type="Library">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>
@ -495,7 +494,6 @@
</Files> </Files>
</Project> </Project>
<!-- Physics Plug-ins --> <!-- Physics Plug-ins -->
<Project name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library"> <Project name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library">
<Configuration name="Debug"> <Configuration name="Debug">
@ -867,7 +865,6 @@
</Files> </Files>
</Project> </Project>
<Project name="OpenSim.Region.Modules.AvatarFactory" path="OpenSim/Region/Modules/AvatarFactory" type="Library"> <Project name="OpenSim.Region.Modules.AvatarFactory" path="OpenSim/Region/Modules/AvatarFactory" type="Library">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>
@ -897,7 +894,6 @@
</Files> </Files>
</Project> </Project>
<Project name="OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects" path="OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects" type="Library"> <Project name="OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects" path="OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects" type="Library">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>
@ -919,7 +915,6 @@
</Files> </Files>
</Project> </Project>
<Project name="OpenSim.Region.Modules.SvnSerialiser" path="OpenSim/Region/Modules/SvnSerialiser" type="Library"> <Project name="OpenSim.Region.Modules.SvnSerialiser" path="OpenSim/Region/Modules/SvnSerialiser" type="Library">
<Configuration name="Debug"> <Configuration name="Debug">
<Options> <Options>