130 files changed, 900 insertions, 677 deletions
diff --git a/OpenSim.GridInterfaces/Local/AssemblyInfo.cs b/OpenSim-Source/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
index 103b49a..103b49a 100644
--- a/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/AssemblyInfo.cs
diff --git a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index 5f75821..5f75821 100644
--- a/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
diff --git a/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalGridServer.cs
index fdd6ba4..fdd6ba4 100644
--- a/OpenSim.GridInterfaces/Local/LocalGridServer.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/LocalGridServer.cs
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
index 1aec5aa..1aec5aa 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
index 6bf398e..6bf398e 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
diff --git a/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs b/OpenSim-Source/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
index 0fa7d6e..0fa7d6e 100644
--- a/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/AssemblyInfo.cs
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
index b004c10..b004c10 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj
diff --git a/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
index 96272dd..96272dd 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
diff --git a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
index 7432dee..7432dee 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
diff --git a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
index 7f911d8..7f911d8 100644
--- a/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
+++ b/OpenSim-Source/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
index 0c9c06c..0c9c06c 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/AssemblyInfo.cs
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
index c37acc8..c37acc8 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
index 6d5b4d0..6d5b4d0 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
index 3497a55..3497a55 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim-Source/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
diff --git a/OpenSim.Physics/Manager/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Physics/Manager/AssemblyInfo.cs
index 57a8913..57a8913 100644
--- a/OpenSim.Physics/Manager/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/AssemblyInfo.cs
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
index 294e005..294e005 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
+++ b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
index 4b5ee51..4b5ee51 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim-Source/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
diff --git a/OpenSim.Physics/Manager/PhysicsActor.cs b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsActor.cs
index a0b6c21..a0b6c21 100644
--- a/OpenSim.Physics/Manager/PhysicsActor.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsActor.cs
diff --git a/OpenSim.Physics/Manager/PhysicsManager.cs b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsManager.cs
index 291fc7e..291fc7e 100644
--- a/OpenSim.Physics/Manager/PhysicsManager.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsManager.cs
diff --git a/OpenSim.Physics/Manager/PhysicsScene.cs b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsScene.cs
index 7dab4e1..7dab4e1 100644
--- a/OpenSim.Physics/Manager/PhysicsScene.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsScene.cs
diff --git a/OpenSim.Physics/Manager/PhysicsVector.cs b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsVector.cs
index 3c824d0..3c824d0 100644
--- a/OpenSim.Physics/Manager/PhysicsVector.cs
+++ b/OpenSim-Source/OpenSim.Physics/Manager/PhysicsVector.cs
diff --git a/OpenSim.Physics/OdePlugin/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
index 913aae7..913aae7 100644
--- a/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/AssemblyInfo.cs
diff --git a/OpenSim.Physics/OdePlugin/OdePlugin.cs b/OpenSim-Source/OpenSim.Physics/OdePlugin/OdePlugin.cs
index 137e44d..599dea8 100644
--- a/OpenSim.Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/OdePlugin.cs
@@ -1,456 +1,452 @@
-/*
+/*
-* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
+* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
-*
+*
-* Redistribution and use in source and binary forms, with or without
+* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
+* modification, are permitted provided that the following conditions are met:
-*     * Redistributions of source code must retain the above copyright
+*     * Redistributions of source code must retain the above copyright
-*       notice, this list of conditions and the following disclaimer.
+*       notice, this list of conditions and the following disclaimer.
-*     * Redistributions in binary form must reproduce the above copyright
+*     * Redistributions in binary form must reproduce the above copyright
-*       notice, this list of conditions and the following disclaimer in the
+*       notice, this list of conditions and the following disclaimer in the
-*       documentation and/or other materials provided with the distribution.
+*       documentation and/or other materials provided with the distribution.
-*     * Neither the name of the <organization> nor the
+*     * Neither the name of the <organization> nor the
-*       names of its contributors may be used to endorse or promote products
+*       names of its contributors may be used to endorse or promote products
-*       derived from this software without specific prior written permission.
+*       derived from this software without specific prior written permission.
-*
+*
-* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
+* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
+* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-* 
+* 
-*/
+*/
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using OpenSim.Physics.Manager;
+using OpenSim.Physics.Manager;
-using Ode.NET;
+using Ode.NET;
-namespace OpenSim.Physics.OdePlugin
+namespace OpenSim.Physics.OdePlugin
-{
+{
-    /// <summary>
+    /// <summary>
-    /// ODE plugin 
+    /// ODE plugin 
-    /// </summary>
+    /// </summary>
-    public class OdePlugin : IPhysicsPlugin
+    public class OdePlugin : IPhysicsPlugin
-    {
+    {
-        private OdeScene _mScene;
+        private OdeScene _mScene;
-        public OdePlugin()
+        public OdePlugin()
-        {
+        {
-        }
+        }
-        public bool Init()
+        public bool Init()
-        {
+        {
-            return true;
+            return true;
-        }
+        }
-        public PhysicsScene GetScene()
+        public PhysicsScene GetScene()
-        {
+        {
-            if (_mScene == null)
+            if (_mScene == null)
-            {
+            {
-                _mScene = new OdeScene();
+                _mScene = new OdeScene();
-            }
+            }
-            return (_mScene);
+            return (_mScene);
-        }
+        }
-        public string GetName()
+        public string GetName()
-        {
+        {
-            return ("OpenDynamicsEngine");
+            return ("OpenDynamicsEngine");
-        }
+        }
-        public void Dispose()
+        public void Dispose()
-        {
+        {
-        }
+        }
-    }
+    }
-    public class OdeScene : PhysicsScene
+    public class OdeScene : PhysicsScene
-    {
+    {
-        static public IntPtr world;
+        static public IntPtr world;
-        static public IntPtr space;
+        static public IntPtr space;
-        static private IntPtr contactgroup;
+        static private IntPtr contactgroup;
-        static private IntPtr LandGeom;
+        static private IntPtr LandGeom;
-        //static private IntPtr Land;
+        //static private IntPtr Land;
-        private double[] _heightmap;
+        private double[] _heightmap;
-        static private d.NearCallback nearCallback = near;
+        static private d.NearCallback nearCallback = near;
-        private List<OdeCharacter> _characters = new List<OdeCharacter>();
+        private List<OdeCharacter> _characters = new List<OdeCharacter>();
-        private static d.ContactGeom[] contacts = new d.ContactGeom[30];
+        private static d.ContactGeom[] contacts = new d.ContactGeom[30];
-        private static d.Contact contact;
+        private static d.Contact contact;
-        public OdeScene()
+        public OdeScene()
-        {
+        {
-            contact.surface.mode = d.ContactFlags.Bounce | d.ContactFlags.SoftCFM;
+            contact.surface.mode = d.ContactFlags.Bounce | d.ContactFlags.SoftCFM;
-            contact.surface.mu = d.Infinity;
+            contact.surface.mu = d.Infinity;
-            contact.surface.mu2 = 0.0f;
+            contact.surface.mu2 = 0.0f;
-            contact.surface.bounce = 0.1f;
+            contact.surface.bounce = 0.1f;
-            contact.surface.bounce_vel = 0.1f;
+            contact.surface.bounce_vel = 0.1f;
-            contact.surface.soft_cfm = 0.01f;
+            contact.surface.soft_cfm = 0.01f;
-            world = d.WorldCreate();
+            world = d.WorldCreate();
-            space = d.HashSpaceCreate(IntPtr.Zero);
+            space = d.HashSpaceCreate(IntPtr.Zero);
-            contactgroup = d.JointGroupCreate(0);
+            contactgroup = d.JointGroupCreate(0);
-            d.WorldSetGravity(world, 0.0f, 0.0f, -0.5f);
+            d.WorldSetGravity(world, 0.0f, 0.0f, -0.5f);
-            //d.WorldSetCFM(world, 1e-5f);
+            //d.WorldSetCFM(world, 1e-5f);
-            d.WorldSetAutoDisableFlag(world, false);
+            d.WorldSetAutoDisableFlag(world, false);
-            d.WorldSetContactSurfaceLayer(world, 0.001f);
+            d.WorldSetContactSurfaceLayer(world, 0.001f);
-           // d.CreatePlane(space, 0, 0, 1, 0);
+           // d.CreatePlane(space, 0, 0, 1, 0);
-            this._heightmap = new double[65536];
+            this._heightmap = new double[65536];
-        }
+        }
-        // This function blatantly ripped off from BoxStack.cs
+        // This function blatantly ripped off from BoxStack.cs
-        static private void near(IntPtr space, IntPtr g1, IntPtr g2)
+        static private void near(IntPtr space, IntPtr g1, IntPtr g2)
-        {
+        {
-            //Console.WriteLine("collision callback");
+            //Console.WriteLine("collision callback");
-            IntPtr b1 = d.GeomGetBody(g1);
+            IntPtr b1 = d.GeomGetBody(g1);
-            IntPtr b2 = d.GeomGetBody(g2);
+            IntPtr b2 = d.GeomGetBody(g2);
-            if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
+            if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
-                return;
+                return;
-            int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf);
+            int count = d.Collide(g1, g2, 500, contacts, d.ContactGeom.SizeOf);
-            for (int i = 0; i < count; ++i)
+            for (int i = 0; i < count; ++i)
-            {
+            {
-                contact.geom = contacts[i];
+                contact.geom = contacts[i];
-                IntPtr joint = d.JointCreateContact(world, contactgroup, ref contact);
+                IntPtr joint = d.JointCreateContact(world, contactgroup, ref contact);
-                d.JointAttach(joint, b1, b2);
+                d.JointAttach(joint, b1, b2);
-            }
+            }
-        }
+        }
-        public override PhysicsActor AddAvatar(PhysicsVector position)
+        public override PhysicsActor AddAvatar(PhysicsVector position)
-        {
+        {
-            PhysicsVector pos = new PhysicsVector();
+            PhysicsVector pos = new PhysicsVector();
-            pos.X = position.X;
+            pos.X = position.X;
-            pos.Y = position.Y;
+            pos.Y = position.Y;
-            pos.Z = position.Z + 20;
+            pos.Z = position.Z + 20;
-            OdeCharacter newAv = new OdeCharacter(this, pos);
+            OdeCharacter newAv = new OdeCharacter(this, pos);
-            this._characters.Add(newAv);
+            this._characters.Add(newAv);
-            return newAv;
+            return newAv;
-        }
+        }
-        public override void RemoveAvatar(PhysicsActor actor)
+        public override void RemoveAvatar(PhysicsActor actor)
-        {
+        {
-        }
+        }
-        public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
+        public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
-        {
+        {
-            PhysicsVector pos = new PhysicsVector();
+            PhysicsVector pos = new PhysicsVector();
-            pos.X = position.X;
+            pos.X = position.X;
-            pos.Y = position.Y;
+            pos.Y = position.Y;
-            pos.Z = position.Z;
+            pos.Z = position.Z;
-            PhysicsVector siz = new PhysicsVector();
+            PhysicsVector siz = new PhysicsVector();
-            siz.X = size.X;
+            siz.X = size.X;
-            siz.Y = size.Y;
+            siz.Y = size.Y;
-            siz.Z = size.Z;
+            siz.Z = size.Z;
-            return new OdePrim();
+            return new OdePrim();
-        }
+        }
-        public override void Simulate(float timeStep)
+        public override void Simulate(float timeStep)
-        {
+        {
-            foreach (OdeCharacter actor in _characters)
+            foreach (OdeCharacter actor in _characters)
-            {
+            {
-                actor.Move(timeStep * 5f);
+                actor.Move(timeStep * 5f);
-            }
+            }
-            d.SpaceCollide(space, IntPtr.Zero, nearCallback);
+            d.SpaceCollide(space, IntPtr.Zero, nearCallback);
-            d.WorldQuickStep(world, timeStep * 5f);
+            d.WorldQuickStep(world, timeStep * 5f);
-            d.JointGroupEmpty(contactgroup);
+            d.JointGroupEmpty(contactgroup);
-            foreach (OdeCharacter actor in _characters)
+            foreach (OdeCharacter actor in _characters)
-            {
+            {
-                actor.UpdatePosition();
+                actor.UpdatePosition();
-            }
+            }
-        }
+        }
-        public override void GetResults()
+        public override void GetResults()
-        {
+        {
-        }
+        }
-        public override bool IsThreaded
+        public override bool IsThreaded
-        {
+        {
-            get
+            get
-            {
+            {
-                return (false); // for now we won't be multithreaded
+                return (false); // for now we won't be multithreaded
-            }
+            }
-        }
+        }
-        public override void SetTerrain(float[] heightMap)
+        public override void SetTerrain(float[] heightMap)
-        {
+        {
-            for (int i = 0; i < 65536; i++)
+            for (int i = 0; i < 65536; i++)
-            {
+            {
-                // this._heightmap[i] = (double)heightMap[i];
+                this._heightmap[i] = (double)heightMap[i];
-                // dbm (danx0r) -- heightmap x,y must be swapped for Ode (should fix ODE, but for now...)
+            }
-                int x = i & 0xff;
+            IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
-                int y = i >> 8;
+            d.GeomHeightfieldDataBuildDouble(HeightmapData, _heightmap, 0, 256, 256, 256, 256, 1.0f, 0.0f, 2.0f, 0);
-                this._heightmap[i] = (double)heightMap[x * 256 + y];
+            d.GeomHeightfieldDataSetBounds(HeightmapData, 256, 256);
-            }
+            LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
-            IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
+            d.Matrix3 R = new d.Matrix3();
-            d.GeomHeightfieldDataBuildDouble(HeightmapData, _heightmap, 0, 256, 256, 256, 256, 1.0f, 0.0f, 2.0f, 0);
+            
-            d.GeomHeightfieldDataSetBounds(HeightmapData, 256, 256);
+            Axiom.MathLib.Quaternion q1 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(1,0,0));
-            LandGeom = d.CreateHeightfield(space, HeightmapData, 1);
+            Axiom.MathLib.Quaternion q2 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(0,1,0));
-            d.Matrix3 R = new d.Matrix3();
+           //Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1));
-            
+            
-            Axiom.MathLib.Quaternion q1 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(1,0,0));
+            q1 = q1 * q2;
-            Axiom.MathLib.Quaternion q2 =Axiom.MathLib.Quaternion.FromAngleAxis(1.5707f, new Axiom.MathLib.Vector3(0,1,0));
+            //q1 = q1 * q3;
-           //Axiom.MathLib.Quaternion q3 = Axiom.MathLib.Quaternion.FromAngleAxis(3.14f, new Axiom.MathLib.Vector3(0, 0, 1));
+            Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3();
-            
+            float angle = 0;
-            q1 = q1 * q2;
+            q1.ToAngleAxis(ref angle, ref v3);
-            //q1 = q1 * q3;
-            Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3();
+            d.RFromAxisAndAngle(out R, v3.x, v3.y, v3.z, angle);
-            float angle = 0;
+            d.GeomSetRotation(LandGeom, ref R); 
-            q1.ToAngleAxis(ref angle, ref v3);
+            d.GeomSetPosition(LandGeom, 128, 128, 0); 
+        }
-            d.RFromAxisAndAngle(out R, v3.x, v3.y, v3.z, angle);
-            d.GeomSetRotation(LandGeom, ref R); 
+        public override void DeleteTerrain()
-            d.GeomSetPosition(LandGeom, 128, 128, 0); 
+        {
-        }
+        }
-        public override void DeleteTerrain()
+    }
-        {
+    public class OdeCharacter : PhysicsActor
-        }
+    {
-    }
+        private PhysicsVector _position;
+        private PhysicsVector _velocity;
-    public class OdeCharacter : PhysicsActor
+        private PhysicsVector _acceleration;
-    {
+        private bool flying;
-        private PhysicsVector _position;
+        //private float gravityAccel;
-        private PhysicsVector _velocity;
+        private IntPtr BoundingCapsule;
-        private PhysicsVector _acceleration;
+        IntPtr capsule_geom;
-        private bool flying;
+        d.Mass capsule_mass;
-        //private float gravityAccel;
-        private IntPtr BoundingCapsule;
+        public OdeCharacter(OdeScene parent_scene, PhysicsVector pos)
-        IntPtr capsule_geom;
+        {
-        d.Mass capsule_mass;
+            _velocity = new PhysicsVector();
+            _position = pos;
-        public OdeCharacter(OdeScene parent_scene, PhysicsVector pos)
+            _acceleration = new PhysicsVector();
-        {
+            d.MassSetCapsule(out capsule_mass, 5.0f, 3, 0.5f, 2f);
-            _velocity = new PhysicsVector();
+            capsule_geom = d.CreateCapsule(OdeScene.space, 0.5f, 2f);
-            _position = pos;
+            this.BoundingCapsule = d.BodyCreate(OdeScene.world);
-            _acceleration = new PhysicsVector();
+            d.BodySetMass(BoundingCapsule, ref capsule_mass);
-            d.MassSetCapsule(out capsule_mass, 5.0f, 3, 0.5f, 2f);
+            d.BodySetPosition(BoundingCapsule, pos.X, pos.Y, pos.Z);
-            capsule_geom = d.CreateCapsule(OdeScene.space, 0.5f, 2f);
+            d.GeomSetBody(capsule_geom, BoundingCapsule);
-            this.BoundingCapsule = d.BodyCreate(OdeScene.world);
+        }
-            d.BodySetMass(BoundingCapsule, ref capsule_mass);
-            d.BodySetPosition(BoundingCapsule, pos.X, pos.Y, pos.Z);
+        public override bool Flying
-            d.GeomSetBody(capsule_geom, BoundingCapsule);
+        {
-        }
+            get
+            {
-        public override bool Flying
+                return flying;
-        {
+            }
-            get
+            set
-            {
+            {
-                return flying;
+                flying = value;
-            }
+            }
-            set
+        }
-            {
-                flying = value;
+        public override PhysicsVector Position
-            }
+        {
-        }
+            get
+            {
-        public override PhysicsVector Position
+                return _position;
-        {
+            }
-            get
+            set
-            {
+            {
-                return _position;
+                _position = value;
-            }
+            }
-            set
+        }
-            {
-                _position = value;
+        public override PhysicsVector Velocity
-            }
+        {
-        }
+            get
+            {
-        public override PhysicsVector Velocity
+                return _velocity;
-        {
+            }
-            get
+            set
-            {
+            {
-                return _velocity;
+                _velocity = value;
-            }
+            }
-            set
+        }
-            {
-                _velocity = value;
+        public override bool Kinematic
-            }
+        {
-        }
+            get
+            {
-        public override bool Kinematic
+                return false;
-        {
+            }
-            get
+            set
-            {
+            {
-                return false;
-            }
+            }
-            set
+        }
-            {
+        public override Axiom.MathLib.Quaternion Orientation
-            }
+        {
-        }
+            get
+            {
-        public override Axiom.MathLib.Quaternion Orientation
+                return Axiom.MathLib.Quaternion.Identity;
-        {
+            }
-            get
+            set
-            {
+            {
-                return Axiom.MathLib.Quaternion.Identity;
-            }
+            }
-            set
+        }
-            {
+        public override PhysicsVector Acceleration
-            }
+        {
-        }
+            get
+            {
-        public override PhysicsVector Acceleration
+                return _acceleration;
-        {
+            }
-            get
-            {
+        }
-                return _acceleration;
+        public void SetAcceleration(PhysicsVector accel)
-            }
+        {
+            this._acceleration = accel;
-        }
+        }
-        public void SetAcceleration(PhysicsVector accel)
-        {
+        public override void AddForce(PhysicsVector force)
-            this._acceleration = accel;
+        {
-        }
+        }
-        public override void AddForce(PhysicsVector force)
-        {
+        public override void SetMomentum(PhysicsVector momentum)
+        {
-        }
+        }
-        public override void SetMomentum(PhysicsVector momentum)
-        {
+        public void Move(float timeStep)
+        {
-        }
+            PhysicsVector vec = new PhysicsVector();
+            vec.X = this._velocity.X * timeStep;
-        public void Move(float timeStep)
+            vec.Y = this._velocity.Y * timeStep;
-        {
+            if (flying)
-            PhysicsVector vec = new PhysicsVector();
+            {
-            vec.X = this._velocity.X * timeStep;
+                vec.Z = (this._velocity.Z + 0.5f) * timeStep;
-            vec.Y = this._velocity.Y * timeStep;
+            }
-            if (flying)
+            d.BodySetLinearVel(this.BoundingCapsule, vec.X, vec.Y, vec.Z);
-            {
+        }
-                vec.Z = (this._velocity.Z + 0.5f) * timeStep;
-            }
+        public void UpdatePosition()
-            d.BodySetLinearVel(this.BoundingCapsule, vec.X, vec.Y, vec.Z);
+        {
-        }
+            d.Vector3 vec = d.BodyGetPosition(BoundingCapsule);
+            this._position.X = vec.X;
-        public void UpdatePosition()
+            this._position.Y = vec.Y;
-        {
+            this._position.Z = vec.Z;
-            d.Vector3 vec = d.BodyGetPosition(BoundingCapsule);
+        }
-            this._position.X = vec.X;
+    }
-            this._position.Y = vec.Y;
-            this._position.Z = vec.Z+1.0f;
+    public class OdePrim : PhysicsActor
-        }
+    {
-    }
+        private PhysicsVector _position;
+        private PhysicsVector _velocity;
-    public class OdePrim : PhysicsActor
+        private PhysicsVector _acceleration;
-    {
-        private PhysicsVector _position;
+        public OdePrim()
-        private PhysicsVector _velocity;
+        {
-        private PhysicsVector _acceleration;
+            _velocity = new PhysicsVector();
+            _position = new PhysicsVector();
-        public OdePrim()
+            _acceleration = new PhysicsVector();
-        {
+        }
-            _velocity = new PhysicsVector();
+        public override bool Flying
-            _position = new PhysicsVector();
+        {
-            _acceleration = new PhysicsVector();
+            get
-        }
+            {
-        public override bool Flying
+                return false; //no flying prims for you
-        {
+            }
-            get
+            set
-            {
+            {
-                return false; //no flying prims for you
-            }
+            }
-            set
+        }
-            {
+        public override PhysicsVector Position
+        {
-            }
+            get
-        }
+            {
-        public override PhysicsVector Position
+                PhysicsVector pos = new PhysicsVector();
-        {
+                //      PhysicsVector vec = this._prim.Position;
-            get
+                //pos.X = vec.X;
-            {
+                //pos.Y = vec.Y;
-                PhysicsVector pos = new PhysicsVector();
+                //pos.Z = vec.Z;
-                //      PhysicsVector vec = this._prim.Position;
+                return pos;
-                //pos.X = vec.X;
-                //pos.Y = vec.Y;
+            }
-                //pos.Z = vec.Z;
+            set
-                return pos;
+            {
+                /*PhysicsVector vec = value;
-            }
+                PhysicsVector pos = new PhysicsVector();
-            set
+                pos.X = vec.X;
-            {
+                pos.Y = vec.Y;
-                /*PhysicsVector vec = value;
+                pos.Z = vec.Z;
-                PhysicsVector pos = new PhysicsVector();
+                this._prim.Position = pos;*/
-                pos.X = vec.X;
+            }
-                pos.Y = vec.Y;
+        }
-                pos.Z = vec.Z;
-                this._prim.Position = pos;*/
+        public override PhysicsVector Velocity
-            }
+        {
-        }
+            get
+            {
-        public override PhysicsVector Velocity
+                return _velocity;
-        {
+            }
-            get
+            set
-            {
+            {
-                return _velocity;
+                _velocity = value;
-            }
+            }
-            set
+        }
-            {
-                _velocity = value;
+        public override bool Kinematic
-            }
+        {
-        }
+            get
+            {
-        public override bool Kinematic
+                return false;
-        {
+                //return this._prim.Kinematic;
-            get
+            }
-            {
+            set
-                return false;
+            {
-                //return this._prim.Kinematic;
+                //this._prim.Kinematic = value;
-            }
+            }
-            set
+        }
-            {
-                //this._prim.Kinematic = value;
+        public override Axiom.MathLib.Quaternion Orientation
-            }
+        {
-        }
+            get
+            {
-        public override Axiom.MathLib.Quaternion Orientation
+                Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion();
-        {
+                return res;
-            get
+            }
-            {
+            set
-                Axiom.MathLib.Quaternion res = new Axiom.MathLib.Quaternion();
+            {
-                return res;
-            }
+            }
-            set
+        }
-            {
+        public override PhysicsVector Acceleration
-            }
+        {
-        }
+            get
+            {
-        public override PhysicsVector Acceleration
+                return _acceleration;
-        {
+            }
-            get
-            {
+        }
-                return _acceleration;
+        public void SetAcceleration(PhysicsVector accel)
-            }
+        {
+            this._acceleration = accel;
-        }
+        }
-        public void SetAcceleration(PhysicsVector accel)
-        {
+        public override void AddForce(PhysicsVector force)
-            this._acceleration = accel;
+        {
-        }
+        }
-        public override void AddForce(PhysicsVector force)
-        {
+        public override void SetMomentum(PhysicsVector momentum)
+        {
-        }
+        }
-        public override void SetMomentum(PhysicsVector momentum)
-        {
+    }
-        }
+}
-    }
-}
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
index 68f1aa1..68f1aa1 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
index f25361a..f25361a 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim-Source/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
diff --git a/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
index 913aae7..913aae7 100644
--- a/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/AssemblyInfo.cs
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
index efe9c79..efe9c79 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj
diff --git a/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
index 5ab70bb..5ab70bb 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
diff --git a/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
index dff1ee2..dff1ee2 100644
--- a/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim-Source/OpenSim.Physics/PhysXPlugin/PhysXPlugin.cs
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim-Source/OpenSim.RegionServer/AgentAssetUpload.cs
index dd2b2a9..dd2b2a9 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AgentAssetUpload.cs
diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim-Source/OpenSim.RegionServer/Assets/AssetCache.cs
index ccebb24..ccebb24 100644
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/Assets/AssetCache.cs
diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim-Source/OpenSim.RegionServer/Assets/InventoryCache.cs
index 64a7a32..64a7a32 100644
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/Assets/InventoryCache.cs
diff --git a/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsBase.cs
index 99b86d4..99b86d4 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsBase.cs
diff --git a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
index 6c1c7d2..6c1c7d2 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
diff --git a/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
index 0802d75..0802d75 100644
--- a/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
diff --git a/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim-Source/OpenSim.RegionServer/CAPS/AdminWebFront.cs
index 2299fa4..2299fa4 100644
--- a/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/CAPS/AdminWebFront.cs
diff --git a/OpenSim.RegionServer/ClientView.Grid.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.Grid.cs
index 5229dbd..a3b191c 100644
--- a/OpenSim.RegionServer/ClientView.Grid.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.Grid.cs
@@ -35,45 +35,38 @@ namespace OpenSim
                foreach (Hashtable neighbour in gridServer.neighbours)
                {
-                    try
+                    string neighbourIPStr = (string)neighbour["sim_ip"];
-                    {
+                    System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr);
-                        string neighbourIPStr = (string)neighbour["sim_ip"];
+                    ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);
-                        System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr);
+                    string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();
-                        ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);
-                        string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();
+                    Console.WriteLine(reqUrl);
-                        Console.WriteLine(reqUrl);
+                    SimParams = new Hashtable();
+                    SimParams["session_id"] = this.SessionID.ToString();
-                        SimParams = new Hashtable();
+                    SimParams["secure_session_id"] = this.SecureSessionID.ToString();
-                        SimParams["session_id"] = this.SessionID.ToString();
+                    SimParams["firstname"] = this.ClientAvatar.firstname;
-                        SimParams["secure_session_id"] = this.SecureSessionID.ToString();
+                    SimParams["lastname"] = this.ClientAvatar.lastname;
-                        SimParams["firstname"] = this.ClientAvatar.firstname;
+                    SimParams["agent_id"] = this.AgentID.ToString();
-                        SimParams["lastname"] = this.ClientAvatar.lastname;
+                    SimParams["circuit_code"] = (Int32)this.CircuitCode;
-                        SimParams["agent_id"] = this.AgentID.ToString();
+                    SimParams["child_agent"] = "1";
-                        SimParams["circuit_code"] = (Int32)this.CircuitCode;
+                    SendParams = new ArrayList();
-                        SimParams["child_agent"] = "1";
+                    SendParams.Add(SimParams);
-                        SendParams = new ArrayList();
-                        SendParams.Add(SimParams);
+                    GridReq = new XmlRpcRequest("expect_user", SendParams);
+                    GridResp = GridReq.Send(reqUrl, 3000);
-                        GridReq = new XmlRpcRequest("expect_user", SendParams);
+                    EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
-                        GridResp = GridReq.Send(reqUrl, 3000);
+                    enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
-                        EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
+                    enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));
-                        enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
-                        enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));
+                    byte[] byteIP = neighbourIP.GetAddressBytes();
+                    enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;
-                        byte[] byteIP = neighbourIP.GetAddressBytes();
+                    enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;
-                        enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;
+                    enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
-                        enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;
+                    enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
-                        enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
+                    enablesimpacket.SimulatorInfo.Port = neighbourPort;
-                        enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
+                    enablePackets.Add(enablesimpacket);
-                        enablesimpacket.SimulatorInfo.Port = neighbourPort;
-                        enablePackets.Add(enablesimpacket);
-                    }
-                    catch (Exception e)
-                    {
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Could not connect to neighbour " + neighbour["sim_ip"] + ":" + neighbour["sim_port"] + ", continuing.");
-                    }
                }
                Thread.Sleep(3000);
                foreach (Packet enable in enablePackets)
diff --git a/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index 070c200..75fcf18 100644
--- a/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -98,39 +98,18 @@ namespace OpenSim
                if (multipleupdate.ObjectData[i].Type == 9) //change position
                {
                    libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
-                    foreach (Entity ent in m_world.Entities.Values)
+                    OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);
-                    {
-                        if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
-                        {
-                            ((OpenSim.world.Primitive)ent).UpdatePosition(pos);
-                        }
-                    }
                    //should update stored position of the prim
                }
                else if (multipleupdate.ObjectData[i].Type == 10)//rotation
                {
                    libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
-                    foreach (Entity ent in m_world.Entities.Values)
+                    OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);
-                    {
-                        if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
-                        {
-                            ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);
-                            ((OpenSim.world.Primitive)ent).UpdateFlag = true;
-                        }
-                    }
                }
                else if (multipleupdate.ObjectData[i].Type == 13)//scale
                {
                    libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
-                    foreach (Entity ent in m_world.Entities.Values)
+                    OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);            
-                    {
-                        if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
-                        {
-                            ((OpenSim.world.Primitive)ent).Scale = scale;
-                        }
-                    }
                }
            }
            return true;
diff --git a/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index a78f27a..a6ad8d2 100644
--- a/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -20,17 +20,20 @@ namespace OpenSim
 {
    public partial class ClientView
    {
-        public delegate void ChatFromViewer(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
+        public delegate void GenericCall(ClientView remoteClient);
-        public delegate void RezObject(AssetBase primasset, LLVector3 pos);
-        public delegate void ModifyTerrain(byte Action, float North, float West);
-        public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
-        public delegate void StartAnim(LLUUID animID, int seq);
-        public delegate void GenericCall(ClientView RemoteClient);
        public delegate void GenericCall2();
        public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.
+        public delegate void GenericCall4(Packet packet, ClientView remoteClient);
+        public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);
+        public delegate void ObjectSelect(uint localID, ClientView remoteClient);
+        public delegate void UpdatePrimFlags(uint localID, Packet packet, ClientView remoteClient);
+        public delegate void UpdatePrimTexture(uint localID, byte[] texture, ClientView remoteClient);
+        public delegate void UpdatePrimVector(uint localID, LLVector3 pos, ClientView remoteClient);
+        public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient);
        public event ChatFromViewer OnChatFromViewer;
        public event RezObject OnRezObject;
+        public event GenericCall4 OnDeRezObject;
        public event ModifyTerrain OnModifyTerrain;
        public event GenericCall OnRegionHandShakeReply;
        public event GenericCall OnRequestWearables;
@@ -39,6 +42,15 @@ namespace OpenSim
        public event GenericCall3 OnAgentUpdate;
        public event StartAnim OnStartAnim;
        public event GenericCall OnRequestAvatarsData;
+        public event LinkObjects OnLinkObjects;
+        public event GenericCall4 OnAddPrim;
+        public event UpdateShape OnUpdatePrimShape;
+        public event ObjectSelect OnObjectSelect;
+        public event UpdatePrimFlags OnUpdatePrimFlags;
+        public event UpdatePrimTexture OnUpdatePrimTexture;
+        public event UpdatePrimVector OnUpdatePrimPosition;
+        public event UpdatePrimRotation OnUpdatePrimRotation;
+        public event UpdatePrimVector OnUpdatePrimScale;
        protected override void ProcessInPacket(Packet Pack)
        {
@@ -62,7 +74,20 @@ namespace OpenSim
                switch (Pack.Type)
                {
-                    #region New Event system
+                    case PacketType.ViewerEffect:
+                        ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;
+                        foreach (ClientView client in m_clientThreads.Values)
+                        {
+                            if (client.AgentID != this.AgentID)
+                            {
+                                viewer.AgentData.AgentID = client.AgentID;
+                                viewer.AgentData.SessionID = client.SessionID;
+                                client.OutPacket(viewer);
+                            }
+                        }
+                        break;
+                    #region New Event System - World/Avatar
                    case PacketType.ChatFromViewer:
                        ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
                        if (Util.FieldToString(inchatpack.ChatData.Message) == "")
@@ -93,153 +118,100 @@ namespace OpenSim
                            }
                        }
                        break;
+                    case PacketType.DeRezObject:
+                        OnDeRezObject(Pack, this);
+                        break;
                    case PacketType.ModifyLand:
-                         ModifyLandPacket modify = (ModifyLandPacket)Pack;
+                        ModifyLandPacket modify = (ModifyLandPacket)Pack;
-                         if (modify.ParcelData.Length > 0)
+                        if (modify.ParcelData.Length > 0)
-                         {
+                        {
-                             OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);
+                            OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);
-                         }
+                        }
-                         break;
+                        break;
+                    case PacketType.RegionHandshakeReply:
+                        OnRegionHandShakeReply(this);
+                        break;
+                    case PacketType.AgentWearablesRequest:
+                        OnRequestWearables(this);
+                        OnRequestAvatarsData(this);
+                        break;
+                    case PacketType.AgentSetAppearance:
+                        AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
+                        OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
+                        break;
+                    case PacketType.CompleteAgentMovement:
+                        if (this.m_child) this.UpgradeClient();
+                        OnCompleteMovementToRegion();
+                        this.EnableNeighbours();
+                        break;
+                    case PacketType.AgentUpdate:
+                        OnAgentUpdate(Pack);
+                        break;
+                    case PacketType.AgentAnimation:
+                        if (!m_child)
+                        {
+                            AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
+                            for (int i = 0; i < AgentAni.AnimationList.Length; i++)
+                            {
+                                if (AgentAni.AnimationList[i].StartAnim)
+                                {
+                                    OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);
+                                }
+                            }
+                        }
+                        break;
-                     case PacketType.RegionHandshakeReply:
-                         OnRegionHandShakeReply(this);
-                         break;
-                     case PacketType.AgentWearablesRequest:
-                         OnRequestWearables(this);
-                         OnRequestAvatarsData(this);
-                         break;
-                     case PacketType.AgentSetAppearance:
-                         AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
-                         OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
-                         break;
-                     case PacketType.CompleteAgentMovement:
-                         if (this.m_child) this.UpgradeClient();
-                         OnCompleteMovementToRegion();
-                         this.EnableNeighbours();
-                         break;
-                     case PacketType.AgentUpdate:
-                         OnAgentUpdate(Pack);
-                         break;
-                     case PacketType.AgentAnimation:
-                         if (!m_child)
-                         {
-                             AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
-                             for (int i = 0; i < AgentAni.AnimationList.Length; i++)
-                             {
-                                 if (AgentAni.AnimationList[i].StartAnim)
-                                 {
-                                     OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);
-                                 }
-                             }
-                         }
-                         break;
-                     case PacketType.AgentIsNowWearing:
-                         // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
-                         //Console.WriteLine(Pack.ToString());
-                         break;
                    #endregion
-                        //old handling, should move most to a event based system.
+                    #region New Event System - Objects/Prims
-                    #region World/Avatar/Primitive related packets
-                    case PacketType.ObjectAdd:
-                        m_world.AddNewPrim((ObjectAddPacket)Pack, this);
-                        break;
                    case PacketType.ObjectLink:
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
+                        // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
                        ObjectLinkPacket link = (ObjectLinkPacket)Pack;
                        uint parentprimid = 0;
-                        OpenSim.world.Primitive parentprim = null;
+                        List<uint> childrenprims = new List<uint>();
                        if (link.ObjectData.Length > 1)
                        {
                            parentprimid = link.ObjectData[0].ObjectLocalID;
-                            foreach (Entity ent in m_world.Entities.Values)
-                            {
-                                if (ent.localid == parentprimid)
-                                {
-                                    parentprim = (OpenSim.world.Primitive)ent;
-                                }
-                            }
                            for (int i = 1; i < link.ObjectData.Length; i++)
                            {
-                                foreach (Entity ent in m_world.Entities.Values)
+                                childrenprims.Add(link.ObjectData[i].ObjectLocalID);
-                                {
-                                    if (ent.localid == link.ObjectData[i].ObjectLocalID)
-                                    {
-                                        ((OpenSim.world.Primitive)ent).MakeParent(parentprim);
-                                    }
-                                }
                            }
                        }
+                        OnLinkObjects(parentprimid, childrenprims);
                        break;
-                    case PacketType.ObjectScale:
+                    case PacketType.ObjectAdd:
-                        OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
+                        m_world.AddNewPrim((ObjectAddPacket)Pack, this);
+                        OnAddPrim(Pack, this);
                        break;
                    case PacketType.ObjectShape:
                        ObjectShapePacket shape = (ObjectShapePacket)Pack;
                        for (int i = 0; i < shape.ObjectData.Length; i++)
                        {
-                            foreach (Entity ent in m_world.Entities.Values)
+                            OnUpdatePrimShape(shape.ObjectData[i].ObjectLocalID, shape.ObjectData[i]);
-                            {
-                                if (ent.localid == shape.ObjectData[i].ObjectLocalID)
-                                {
-                                    ((OpenSim.world.Primitive)ent).UpdateShape(shape.ObjectData[i]);
-                                }
-                            }
                        }
                        break;
                    case PacketType.ObjectSelect:
                        ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;
                        for (int i = 0; i < incomingselect.ObjectData.Length; i++)
                        {
-                            foreach (Entity ent in m_world.Entities.Values)
+                            OnObjectSelect(incomingselect.ObjectData[i].ObjectLocalID, this);
-                            {
-                                if (ent.localid == incomingselect.ObjectData[i].ObjectLocalID)
-                                {
-                                    ((OpenSim.world.Primitive)ent).GetProperites(this);
-                                    break;
-                                }
-                            }
                        }
                        break;
+                    case PacketType.ObjectFlagUpdate:
+                        ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;
+                        OnUpdatePrimFlags(flags.AgentData.ObjectLocalID, Pack, this);
+                        break;
                    case PacketType.ObjectImage:
                        ObjectImagePacket imagePack = (ObjectImagePacket)Pack;
                        for (int i = 0; i < imagePack.ObjectData.Length; i++)
                        {
-                            foreach (Entity ent in m_world.Entities.Values)
+                            OnUpdatePrimTexture(imagePack.ObjectData[i].ObjectLocalID, imagePack.ObjectData[i].TextureEntry, this);
-                            {
-                                if (ent.localid == imagePack.ObjectData[i].ObjectLocalID)
-                                {
-                                    ((OpenSim.world.Primitive)ent).UpdateTexture(imagePack.ObjectData[i].TextureEntry);
-                                }
-                            }
-                        }
-                        break;
-                    case PacketType.ObjectFlagUpdate:
-                        ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;
-                        foreach (Entity ent in m_world.Entities.Values)
-                        {
-                            if (ent.localid == flags.AgentData.ObjectLocalID)
-                            {
-                                ((OpenSim.world.Primitive)ent).UpdateObjectFlags(flags);
-                            }
                        }
                        break;
+                    #endregion      
                   
-                    case PacketType.ViewerEffect:
-                        ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;
-                        foreach (ClientView client in m_clientThreads.Values)
-                        {
-                            if (client.AgentID != this.AgentID)
-                            {
-                                viewer.AgentData.AgentID = client.AgentID;
-                                viewer.AgentData.SessionID = client.SessionID;
-                                client.OutPacket(viewer);
-                            }
-                        }
-                        break;
-                    #endregion
                    #region Inventory/Asset/Other related packets
                    case PacketType.RequestImage:
                        RequestImagePacket imageRequest = (RequestImagePacket)Pack;
@@ -464,6 +436,16 @@ namespace OpenSim
                        }
                        break;
                    #endregion
+                    #region unimplemented handlers
+                    case PacketType.AgentIsNowWearing:
+                        // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
+                        //Console.WriteLine(Pack.ToString());
+                        break;
+                    case PacketType.ObjectScale:
+                        //OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
+                        break;
+                    #endregion
                }
            }
        }
diff --git a/OpenSim.RegionServer/ClientView.cs b/OpenSim-Source/OpenSim.RegionServer/ClientView.cs
index ccea2f3..e66b830 100644
--- a/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientView.cs
@@ -50,7 +50,7 @@ namespace OpenSim
    /// Handles new client connections
    /// Constructor takes a single Packet and authenticates everything
    /// </summary>
-    public partial class ClientView : ClientViewBase
+    public partial class ClientView : ClientViewBase, IClientAPI
    {
        protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients
        protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); //local handlers for this instance 
@@ -138,7 +138,6 @@ namespace OpenSim
            {
                this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode);
                m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false);
-                //Console.WriteLine("upgrade start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);
            }
            this.InitNewClient();
        }
diff --git a/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim-Source/OpenSim.RegionServer/ClientViewBase.cs
index 814b025..572dbce 100644
--- a/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/ClientViewBase.cs
@@ -9,11 +9,11 @@ using System.IO;
 using System.Threading;
 using System.Timers;
 using OpenSim.Framework.Utilities;
+using OpenSim.Framework.Interfaces;
 namespace OpenSim
 {
-    public class ClientViewBase
+    public class ClientViewBase 
    {
        protected BlockingQueue<QueItem> PacketQueue;
        protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();
diff --git a/OpenSim.RegionServer/Grid.cs b/OpenSim-Source/OpenSim.RegionServer/Grid.cs
index db5b8fe..db5b8fe 100644
--- a/OpenSim.RegionServer/Grid.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/Grid.cs
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 512ee88..512ee88 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj
diff --git a/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 4ec3537..4ec3537 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim-Source/OpenSim.RegionServer/OpenSimMain.cs
index 003412d..003412d 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSimMain.cs
diff --git a/OpenSim.RegionServer/OpenSimNetworkHandler.cs b/OpenSim-Source/OpenSim.RegionServer/OpenSimNetworkHandler.cs
index 15ee740..15ee740 100644
--- a/OpenSim.RegionServer/OpenSimNetworkHandler.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/OpenSimNetworkHandler.cs
diff --git a/OpenSim.RegionServer/PacketServer.cs b/OpenSim-Source/OpenSim.RegionServer/PacketServer.cs
index 4ebe023..fb35723 100644
--- a/OpenSim.RegionServer/PacketServer.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/PacketServer.cs
@@ -58,7 +58,7 @@ namespace OpenSim
        {
            if (this._localWorld != null)
            {
-                ClientView.AddPacketHandler(PacketType.DeRezObject, _localWorld.DeRezObject);
+                //ClientView.AddPacketHandler(PacketType.DeRezObject, _localWorld.DeRezObject);
                ClientView.AddPacketHandler(PacketType.UUIDNameRequest, this.RequestUUIDName);
            }
        }
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim-Source/OpenSim.RegionServer/RegionInfo.cs
index f82495a..f82495a 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/RegionInfo.cs
diff --git a/OpenSim.RegionServer/RegionInfoBase.cs b/OpenSim-Source/OpenSim.RegionServer/RegionInfoBase.cs
index 42d3030..42d3030 100644
--- a/OpenSim.RegionServer/RegionInfoBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/RegionInfoBase.cs
diff --git a/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim-Source/OpenSim.RegionServer/RegionServerBase.cs
index 69a8748..69a8748 100644
--- a/OpenSim.RegionServer/RegionServerBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/RegionServerBase.cs
diff --git a/OpenSim.RegionServer/UDPServer.cs b/OpenSim-Source/OpenSim.RegionServer/UDPServer.cs
index 3a93e66..3a93e66 100644
--- a/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/UDPServer.cs
diff --git a/OpenSim.RegionServer/VersionInfo.cs b/OpenSim-Source/OpenSim.RegionServer/VersionInfo.cs
index 49cc6a5..49cc6a5 100644
--- a/OpenSim.RegionServer/VersionInfo.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/VersionInfo.cs
diff --git a/OpenSim.RegionServer/types/Mesh.cs b/OpenSim-Source/OpenSim.RegionServer/types/Mesh.cs
index 3e00c91..3e00c91 100644
--- a/OpenSim.RegionServer/types/Mesh.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/types/Mesh.cs
diff --git a/OpenSim.RegionServer/types/Triangle.cs b/OpenSim-Source/OpenSim.RegionServer/types/Triangle.cs
index 8dfea6e..8dfea6e 100644
--- a/OpenSim.RegionServer/types/Triangle.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/types/Triangle.cs
diff --git a/OpenSim.RegionServer/world/Avatar.Client.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Client.cs
index 7656a89..7656a89 100644
--- a/OpenSim.RegionServer/world/Avatar.Client.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Client.cs
diff --git a/OpenSim.RegionServer/world/Avatar.Update.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Update.cs
index 266fc38..e49fab3 100644
--- a/OpenSim.RegionServer/world/Avatar.Update.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.Update.cs
@@ -93,10 +93,10 @@ namespace OpenSim.world
            }
        }
-        public void SendUpdateToOtherClient(Avatar RemoteAvatar)
+        public void SendUpdateToOtherClient(Avatar remoteAvatar)
        {
            ObjectUpdatePacket objupdate = CreateUpdatePacket();
-            RemoteAvatar.SendPacketToViewer(objupdate);
+            remoteAvatar.SendPacketToViewer(objupdate);
        }
        public ObjectUpdatePacket CreateUpdatePacket()
diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs
index 4e90364..680d059 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Avatar.cs
@@ -6,6 +6,7 @@ using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Physics.Manager;
 using OpenSim.Framework.Inventory;
+using OpenSim.Framework.Interfaces;
 using Axiom.MathLib;
 namespace OpenSim.world
@@ -66,11 +67,11 @@ namespace OpenSim.world
            //register for events
            ControllingClient.OnRequestWearables += new ClientView.GenericCall(this.SendOurAppearance);
-            ControllingClient.OnSetAppearance += new ClientView.SetAppearance(this.SetAppearance);
+            ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
            ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.CompleteMovement);
            ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.SendInitialPosition);
            ControllingClient.OnAgentUpdate += new ClientView.GenericCall3(this.HandleAgentUpdate);
-            ControllingClient.OnStartAnim += new ClientView.StartAnim(this.SendAnimPack);
+            ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);
        }
@@ -349,7 +350,7 @@ namespace OpenSim.world
        }
        //really really should be moved somewhere else (RegionInfo.cs ?)
-        public void SendRegionHandshake(World RegionInfo)
+        public void SendRegionHandshake(World regionInfo)
        {
            OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");
            System.Text.Encoding _enc = System.Text.Encoding.ASCII;
diff --git a/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim-Source/OpenSim.RegionServer/world/AvatarAnimations.cs
index b554af8..b554af8 100644
--- a/OpenSim.RegionServer/world/AvatarAnimations.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/AvatarAnimations.cs
diff --git a/OpenSim.RegionServer/world/Entity.cs b/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs
index 96e039a..96e039a 100644
--- a/OpenSim.RegionServer/world/Entity.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Entity.cs
diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim-Source/OpenSim.RegionServer/world/Primitive.cs
index e048a9e..e048a9e 100644
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Primitive.cs
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim-Source/OpenSim.RegionServer/world/Primitive2.cs
index 6d071d4..6d071d4 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/Primitive2.cs
diff --git a/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim-Source/OpenSim.RegionServer/world/SceneObject.cs
index a846fb5..a846fb5 100644
--- a/OpenSim.RegionServer/world/SceneObject.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/SceneObject.cs
diff --git a/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim-Source/OpenSim.RegionServer/world/World.PacketHandlers.cs
index 7d74cb7..348cd30 100644
--- a/OpenSim.RegionServer/world/World.PacketHandlers.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/World.PacketHandlers.cs
@@ -15,31 +15,31 @@ namespace OpenSim.world
 {
    public partial class World
    {
-        public void ModifyTerrain(byte Action, float North, float West)
+        public void ModifyTerrain(byte action, float north, float west)
        {
-            switch (Action)
+            switch (action)
            {
                case 1:
                    // raise terrain
-                    Terrain.raise(North, West, 10.0, 0.001);
+                    Terrain.raise(north, west, 10.0, 0.1);
-                    RegenerateTerrain(true, (int)North, (int)West);
+                    RegenerateTerrain(true, (int)north, (int)west);
                    break;
                case 2:
                    //lower terrain
-                    Terrain.lower(North, West, 10.0, 0.001);
+                    Terrain.lower(north, west, 10.0, 0.1);
-                    RegenerateTerrain(true, (int)North, (int)West);
+                    RegenerateTerrain(true, (int)north, (int)west);
                    break;
            }
            return;
        }
        public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
-        {  
+        {
            foreach (ClientView client in m_clientThreads.Values)
            {
                // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
                int dis = (int)client.ClientAvatar.Pos.GetDistanceTo(fromPos);
-                
                switch (type)
                {
                    case 0: // Whisper
@@ -61,7 +61,7 @@ namespace OpenSim.world
                            client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
                        }
                        break;
-                        
                    case 0xff: // Broadcast
                        client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
                        break;
@@ -70,16 +70,16 @@ namespace OpenSim.world
            }
        }
-        public void RezObject(AssetBase primasset, LLVector3 pos)
+        public void RezObject(AssetBase primAsset, LLVector3 pos)
        {
-            PrimData primd = new PrimData(primasset.Data);
+            PrimData primd = new PrimData(primAsset.Data);
            Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
            nPrim.CreateFromStorage(primd, pos, this._primCount, true);
            this.Entities.Add(nPrim.uuid, nPrim);
            this._primCount++;
        }
-        public bool DeRezObject(ClientView simClient, Packet packet)
+        public void DeRezObject(Packet packet, ClientView simClient)
        {
            DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet;
@@ -165,19 +165,130 @@ namespace OpenSim.world
                    }
                }
            }
-            return true;
+            
        }
-        public void SendAvatarsToClient(ClientView RemoteClient)
+        public void SendAvatarsToClient(ClientView remoteClient)
        {
            foreach (ClientView client in m_clientThreads.Values)
            {
-                if (client.AgentID != RemoteClient.AgentID)
+                if (client.AgentID != remoteClient.AgentID)
+                {
+                    // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket();
+                    // RemoteClient.OutPacket(objupdate);
+                    client.ClientAvatar.SendUpdateToOtherClient(remoteClient.ClientAvatar);
+                    client.ClientAvatar.SendAppearanceToOtherAgent(remoteClient.ClientAvatar);
+                }
+            }
+        }
+        public void LinkObjects(uint parentPrim, List<uint> childPrims)
+        {
+            Primitive parentprim = null;
+            foreach (Entity ent in Entities.Values)
+            {
+                if (ent.localid == parentPrim)
+                {
+                    parentprim = (OpenSim.world.Primitive)ent;
+                }
+            }
+            for (int i = 0; i < childPrims.Count; i++)
+            {
+                uint childId = childPrims[i];
+                foreach (Entity ent in Entities.Values)
+                {
+                    if (ent.localid == childId)
+                    {
+                        ((OpenSim.world.Primitive)ent).MakeParent(parentprim);
+                    }
+                }
+            }
+        }
+        public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock)
+        {
+            foreach (Entity ent in Entities.Values)
+            {
+                if (ent.localid == primLocalID)
+                {
+                    ((OpenSim.world.Primitive)ent).UpdateShape(shapeBlock);
+                    break;
+                }
+            }
+        }
+        public void SelectPrim(uint primLocalID, ClientView remoteClient)
+        {
+            foreach (Entity ent in Entities.Values)
+            {
+                if (ent.localid == primLocalID)
+                {
+                    ((OpenSim.world.Primitive)ent).GetProperites(remoteClient);
+                    break;
+                }
+            }
+        }
+        public void UpdatePrimFlags(uint localID, Packet packet, ClientView remoteClient)
+        {
+            foreach (Entity ent in Entities.Values)
+            {
+                if (ent.localid == localID)
+                {
+                    ((OpenSim.world.Primitive)ent).UpdateObjectFlags((ObjectFlagUpdatePacket) packet);
+                    break;
+                }
+            }
+        }
+        public void UpdatePrimTexture(uint localID, byte[] texture, ClientView remoteClient)
+        {
+            foreach (Entity ent in Entities.Values)
+            {
+                if (ent.localid == localID)
+                {
+                    ((OpenSim.world.Primitive)ent).UpdateTexture(texture);
+                    break;
+                }
+            }
+        }
+        public void UpdatePrimPosition(uint localID, LLVector3 pos, ClientView remoteClient)
+        {
+            foreach (Entity ent in Entities.Values)
+            {
+                if (ent.localid == localID)
+                {
+                    ((OpenSim.world.Primitive)ent).UpdatePosition(pos);
+                    break;
+                }
+            }
+        }
+        public void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient)
+        {
+            foreach (Entity ent in Entities.Values)
+            {
+                if (ent.localid == localID)
                {
-                   // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket();
+                    ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);
-                   // RemoteClient.OutPacket(objupdate);
+                    ((OpenSim.world.Primitive)ent).UpdateFlag = true;
-                    client.ClientAvatar.SendUpdateToOtherClient(RemoteClient.ClientAvatar);
+                    break;
-                    client.ClientAvatar.SendAppearanceToOtherAgent(RemoteClient.ClientAvatar);
+                }
+            }
+        }
+        public void UpdatePrimScale(uint localID, LLVector3 scale, ClientView remoteClient)
+        {
+            foreach (Entity ent in Entities.Values)
+            {
+                if (ent.localid == localID)
+                {
+                    ((OpenSim.world.Primitive)ent).Scale = scale;
+                    break;
                }
            }
        }
diff --git a/OpenSim.RegionServer/world/World.Scripting.cs b/OpenSim-Source/OpenSim.RegionServer/world/World.Scripting.cs
index 44ef05a..44ef05a 100644
--- a/OpenSim.RegionServer/world/World.Scripting.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/World.Scripting.cs
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim-Source/OpenSim.RegionServer/world/World.cs
index 99fb8e0..921da3c 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/World.cs
@@ -495,9 +495,9 @@ namespace OpenSim.world
            }
        }
-        public void AddNewPrim(ObjectAddPacket addPacket, ClientView AgentClient)
+        public void AddNewPrim(Packet addPacket, ClientView agentClient)
        {
-            AddNewPrim(addPacket, AgentClient.AgentID);
+            AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentID);
        }
        public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)
@@ -533,12 +533,22 @@ namespace OpenSim.world
        public override void AddViewerAgent(ClientView agentClient)
        {
            //register for events
-            agentClient.OnChatFromViewer += new ClientView.ChatFromViewer(this.SimChat);
+            agentClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);
-            agentClient.OnRezObject += new ClientView.RezObject(this.RezObject);
+            agentClient.OnRezObject += new RezObject(this.RezObject);
-            agentClient.OnModifyTerrain += new ClientView.ModifyTerrain(this.ModifyTerrain);
+            agentClient.OnModifyTerrain += new ModifyTerrain(this.ModifyTerrain);
            agentClient.OnRegionHandShakeReply += new ClientView.GenericCall(this.SendLayerData);
            agentClient.OnRequestWearables += new ClientView.GenericCall(this.GetInitialPrims);
            agentClient.OnRequestAvatarsData += new ClientView.GenericCall(this.SendAvatarsToClient);
+            agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects);
+            agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim);
+            agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape);
+            agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim);
+            agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags);
+            agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture);
+            agentClient.OnUpdatePrimPosition += new ClientView.UpdatePrimVector(this.UpdatePrimPosition);
+            agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation);
+            agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale);
+            agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject);
            try
            {
diff --git a/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim-Source/OpenSim.RegionServer/world/WorldBase.cs
index edc5518..edc5518 100644
--- a/OpenSim.RegionServer/world/WorldBase.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/WorldBase.cs
diff --git a/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs
index 465c23b..465c23b 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptContext.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptContext.cs
diff --git a/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
index 2ef16a4..2ef16a4 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
diff --git a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
index 15efc49..15efc49 100644
--- a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
diff --git a/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs
index 48c18ff..48c18ff 100644
--- a/OpenSim.RegionServer/world/scripting/Script.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Script.cs
diff --git a/OpenSim.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
index 4c6d373..4c6d373 100644
--- a/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
diff --git a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
index 6a689ab..6a689ab 100644
--- a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
+++ b/OpenSim-Source/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
index 15ef814..15ef814 100644
--- a/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassInstance.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
index f2f0da5..f2f0da5 100644
--- a/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/ClassRecord.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Heap.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Heap.cs
index 138e85e..138e85e 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Heap.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Heap.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
index b94248c..b94248c 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Interpreter.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
index 3b7da35..3b7da35 100644
--- a/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterLogic.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
index c66c148..c66c148 100644
--- a/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterMethods.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
index 6704e31..6704e31 100644
--- a/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/InterpreterReturn.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
index ff18f90..ff18f90 100644
--- a/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MainMemory.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
index 2541991..2541991 100644
--- a/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/MethodMemory.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Object.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Object.cs
index e6e392c..e6e392c 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Object.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Object.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index a1e95f4..a1e95f4 100644
--- a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
diff --git a/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index ae79c83..ae79c83 100644
--- a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
diff --git a/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
index b47bb50..b47bb50 100644
--- a/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/OpenSimJVM.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
index 53a0f08..53a0f08 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Stack.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Stack.cs
index d77d82e..d77d82e 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Stack.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Stack.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
index afca7a9..afca7a9 100644
--- a/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/StackFrame.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Thread.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Thread.cs
index 436949c..436949c 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Thread.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Thread.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
index 2854eab..2854eab 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ArrayReference.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
index 270aa7b..270aa7b 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/BaseType.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
index da28eaa..da28eaa 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/ObjectReference.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
index 1a3ecff..1a3ecff 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Byte.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
index 19002d4..19002d4 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Char.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
index 91f1679..91f1679 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Float.cs
diff --git a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
index 4ecd325..4ecd325 100644
--- a/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
+++ b/OpenSim-Source/OpenSim.Scripting/EmbeddedJVM/Types/PrimitiveTypes/Int.cs
diff --git a/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
index d4db8c0..d4db8c0 100644
--- a/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/BDBLocalStorage.cs
diff --git a/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
index 12c5016..12c5016 100644
--- a/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
index 885b088..885b088 100644
--- a/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
diff --git a/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
index 6610606..6610606 100644
--- a/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/AssemblyInfo.cs
diff --git a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 5dceb7f..5dceb7f 100644
--- a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
diff --git a/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
index db590ff..db590ff 100644
--- a/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
index 6504b77..6504b77 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 8be321d..8be321d 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
diff --git a/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
index ba9e139..ba9e139 100644
--- a/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageDb4o/UUIDQuery.cs
diff --git a/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
index 8039721..8039721 100644
--- a/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj
diff --git a/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
index 79c27fc..79c27fc 100644
--- a/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
diff --git a/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
index fe81f8a..fe81f8a 100644
--- a/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 368405b..368405b 100644
--- a/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim-Source/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
diff --git a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
index 5a73897..1cdfaf6 100644
--- a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj
@@ -66,10 +66,6 @@
      <HintPath>System.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System.Drawing" >
-      <HintPath>System.Drawing.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
    <Reference Include="System.Data" >
      <HintPath>System.Data.dll</HintPath>
      <Private>False</Private>
diff --git a/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.csproj.user
@@ -0,0 +1,12 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
index 86c6a5c..e1a3d2d 100644
--- a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
@@ -19,11 +19,10 @@
                    <include name="${project::get-base-directory()}" />
                    <include name="${project::get-base-directory()}/${build.dir}" />
                </lib>
-                <include name="../bin/libTerrain-BSD.dll" />
                <include name="System.dll" />
-                <include name="System.Drawing.dll" />
                <include name="System.Data.dll" />
                <include name="System.Xml.dll" />
+                <include name="../bin/libTerrain-BSD.dll" />
            </references>
        </csc>
        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
diff --git a/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
index bd74993..bd74993 100644
--- a/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
index a0f37f9..a0f37f9 100644
--- a/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
+++ b/OpenSim-Source/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
diff --git a/OpenSim/Application.cs b/OpenSim-Source/OpenSim/Application.cs
index 3f9c0ec..3f9c0ec 100644
--- a/OpenSim/Application.cs
+++ b/OpenSim-Source/OpenSim/Application.cs
diff --git a/OpenSim/OpenSim.csproj b/OpenSim-Source/OpenSim/OpenSim.csproj
index 4456fc7..4456fc7 100644
--- a/OpenSim/OpenSim.csproj
+++ b/OpenSim-Source/OpenSim/OpenSim.csproj
diff --git a/OpenSim-Source/OpenSim/OpenSim.csproj.user b/OpenSim-Source/OpenSim/OpenSim.csproj.user
new file mode 100644
index 0000000..1422ebf
--- /dev/null
+++ b/OpenSim-Source/OpenSim/OpenSim.csproj.user
@@ -0,0 +1,13 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <StartArguments>-loginserver -sandbox -accounts</StartArguments>
+    <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
+    <LastOpenVersion>8.0.50727</LastOpenVersion>
+    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectTrust>0</ProjectTrust>
+  </PropertyGroup>
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+</Project>
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim-Source/OpenSim/OpenSim.exe.build
index 19d0b28..19d0b28 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim-Source/OpenSim/OpenSim.exe.build
diff --git a/OpenSim/OpenSimMain.cs b/OpenSim-Source/OpenSim/OpenSimMain.cs
index 9025316..9025316 100644
--- a/OpenSim/OpenSimMain.cs
+++ b/OpenSim-Source/OpenSim/OpenSimMain.cs