diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 6a5620411b..08496987bb 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 5fc0a4291f..bcef1cdd5b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -34,25 +34,25 @@
 
     <!-- Core OpenSim Projects -->
 <!--
-    <Project name="OpenSim.Model" path="OpenSim/Model" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
+        <Project name="OpenSim.Model" path="OpenSim/Model" type="Library">
+          <Configuration name="Debug">
+            <Options>
+              <OutputPath>../../../bin/</OutputPath>
+            </Options>
+          </Configuration>
+          <Configuration name="Release">
+            <Options>
+              <OutputPath>../../../bin/</OutputPath>
+            </Options>
+          </Configuration>
 
-      <ReferencePath>../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
-      <Reference name="System.Xml" localCopy="false"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
+          <ReferencePath>../../../bin/</ReferencePath>
+          <Reference name="System" localCopy="false"/>
+          <Reference name="System.Xml" localCopy="false"/>
+          <Files>
+            <Match pattern="*.cs" recurse="true"/>
+          </Files>
+        </Project>
 -->
     <Project name="OpenSim.Framework.Console" path="OpenSim/Framework/Console" type="Library">
       <Configuration name="Debug">
@@ -196,7 +196,6 @@
       </Files>
     </Project>
 
-
     <Project name="OpenSim.Data" path="OpenSim/Data" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -224,7 +223,7 @@
       </Files>
     </Project>
 
- 
+    
     <Project name="OpenSim.Data.MySQLMapper" path="OpenSim/Data/MySQLMapper" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -495,7 +494,6 @@
       </Files>
     </Project>
 
-
     <!-- Physics Plug-ins -->
     <Project name="OpenSim.Region.Physics.BasicPhysicsPlugin" path="OpenSim/Region/Physics/BasicPhysicsPlugin" type="Library">
       <Configuration name="Debug">
@@ -867,8 +865,7 @@
       </Files>
     </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">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>          
@@ -897,8 +894,7 @@
       </Files>
     </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">
         <Options>
           <OutputPath>../../../../../../bin/Terrain/</OutputPath>          
@@ -919,8 +915,7 @@
       </Files>
     </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">
         <Options>
           <OutputPath>../../../../bin/</OutputPath>          
@@ -942,8 +937,8 @@
       <Reference name="OpenSim.Data.Base" />
       <Reference name="OpenSim.Region.Environment"/>
       <Reference name="Nini.dll" />
-	  <Reference name="PumaCode.SvnDotNet.dll" />
-	  <Reference name="log4net"/>
+      <Reference name="PumaCode.SvnDotNet.dll" />
+      <Reference name="log4net"/>
       <Files>
         <Match pattern="*.cs" recurse="true"/>
       </Files>
@@ -1101,7 +1096,7 @@
       <Reference name="OpenSim"/>
       <Reference name="OpenSim.Region.ClientStack"/>
       <Reference name="OpenSim.Region.Environment"/>
-	  <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="OpenSim.Framework.Console"/>
@@ -1115,32 +1110,32 @@
     <!-- Scene Server API Example Apps -->
 
     <Project name="OpenSim.Region.DataSnapshot" path="OpenSim/Region/DataSnapshot" type="Library">
-          <Configuration name="Debug">
-              <Options>
-                  <OutputPath>../../../bin/</OutputPath>
-              </Options>
-          </Configuration>
-          <Configuration name="Release">
-              <Options>
-                  <OutputPath>../../../bin/</OutputPath>
-              </Options>
-          </Configuration>
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
 
-          <ReferencePath>../../../bin/</ReferencePath>
-          <Reference name="System" localCopy="false"/>
-          <Reference name="System.Xml"/>
-          <Reference name="System.Data"/>
-          <Reference name="OpenSim.Framework"/>
-          <Reference name="OpenSim.Framework.Communications"/>
-          <Reference name="OpenSim.Framework.Console"/>
-          <Reference name="OpenSim.Framework.Servers"/>
-          <Reference name="OpenSim.Region.Environment"/>
-          <Reference name="libsecondlife.dll"/>
-          <Reference name="Nini.dll" />
-          <Reference name="log4net.dll" />
-          <Files>
-              <Match pattern="*.cs" recurse="true"/>
-          </Files>
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System" localCopy="false"/>
+      <Reference name="System.Xml"/>
+      <Reference name="System.Data"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Framework.Servers"/>
+      <Reference name="OpenSim.Region.Environment"/>
+      <Reference name="libsecondlife.dll"/>
+      <Reference name="Nini.dll" />
+      <Reference name="log4net.dll" />
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
     </Project>
 
     <Project name="OpenSim.Region.Examples.SimpleModule" path="OpenSim/Region/Examples/SimpleModule" type="Library">