23 files changed, 148 insertions, 140 deletions

diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index 13619eb..bec85cc 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -170,13 +170,13 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="OpenSimMain.cs">

+    <Compile Include="Application.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="VersionInfo.cs">

+    <Compile Include="OpenSimMain.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Application.cs">

+    <Compile Include="VersionInfo.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 355092b..6c7d7ac 100644
--- a/OpenSim/Region/Application/OpenSim.exe.build
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

+                <include name="Application.cs" />

                 <include name="OpenSimMain.cs" />

                 <include name="VersionInfo.cs" />

-                <include name="Application.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index 1ed28d2..4667d52 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -96,40 +96,40 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="LLSDCapsDetails.cs">

+    <Compile Include="Caps.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="LLSDArray.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LLSDEmpty.cs">

+    <Compile Include="LLSDCapEvent.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LLSDTest.cs">

+    <Compile Include="LLSDCapsDetails.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LLSDUploadReply.cs">

+    <Compile Include="LLSDEmpty.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LLSDType.cs">

+    <Compile Include="LLSDHelpers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LLSDHelpers.cs">

+    <Compile Include="LLSDMapLayer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LLSDCapEvent.cs">

+    <Compile Include="LLSDMapLayerResponse.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="LLSDMapRequest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Caps.cs">

+    <Compile Include="LLSDTest.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LLSDMapLayerResponse.cs">

+    <Compile Include="LLSDType.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="LLSDMapLayer.cs">

+    <Compile Include="LLSDUploadReply.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
index dd853e7..a091b5c 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -11,18 +11,18 @@
             <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="LLSDCapsDetails.cs" />

+                <include name="Caps.cs" />

                 <include name="LLSDArray.cs" />

+                <include name="LLSDCapEvent.cs" />

+                <include name="LLSDCapsDetails.cs" />

                 <include name="LLSDEmpty.cs" />

-                <include name="LLSDTest.cs" />

-                <include name="LLSDUploadReply.cs" />

-                <include name="LLSDType.cs" />

                 <include name="LLSDHelpers.cs" />

-                <include name="LLSDCapEvent.cs" />

-                <include name="LLSDMapRequest.cs" />

-                <include name="Caps.cs" />

-                <include name="LLSDMapLayerResponse.cs" />

                 <include name="LLSDMapLayer.cs" />

+                <include name="LLSDMapLayerResponse.cs" />

+                <include name="LLSDMapRequest.cs" />

+                <include name="LLSDTest.cs" />

+                <include name="LLSDType.cs" />

+                <include name="LLSDUploadReply.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>

diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 9c4462d..402a3ca 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -211,7 +211,7 @@ namespace OpenSim.Region.ClientStack
         protected virtual void InitNewClient()

         {

             OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");

-            this.m_world.AddNewClient(this, this.AgentID, false);

+            this.m_world.AddNewClient(this, false);

         }

 

         protected virtual void AuthUser()

diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index 2e1d8e2..3093eb0 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="ClientView.AgentAssetUpload.cs">

+    <Compile Include="ClientStackNetworkHandler.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientStackNetworkHandler.cs">

+    <Compile Include="ClientView.AgentAssetUpload.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="PacketServer.cs">

+    <Compile Include="ClientView.API.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UDPServer.cs">

+    <Compile Include="ClientView.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="ClientView.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.API.cs">

+    <Compile Include="ClientView.ProcessPackets.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.ProcessPackets.cs">

+    <Compile Include="ClientViewBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionApplicationBase.cs">

+    <Compile Include="PacketServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientViewBase.cs">

+    <Compile Include="RegionApplicationBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.cs">

+    <Compile Include="UDPServer.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Assets\InventoryCache.cs">

diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 1c791d3..f76a4c8 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
             <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="ClientView.AgentAssetUpload.cs" />

                 <include name="ClientStackNetworkHandler.cs" />

-                <include name="PacketServer.cs" />

-                <include name="UDPServer.cs" />

-                <include name="ClientView.PacketHandlers.cs" />

+                <include name="ClientView.AgentAssetUpload.cs" />

                 <include name="ClientView.API.cs" />

+                <include name="ClientView.cs" />

+                <include name="ClientView.PacketHandlers.cs" />

                 <include name="ClientView.ProcessPackets.cs" />

-                <include name="RegionApplicationBase.cs" />

                 <include name="ClientViewBase.cs" />

-                <include name="ClientView.cs" />

+                <include name="PacketServer.cs" />

+                <include name="RegionApplicationBase.cs" />

+                <include name="UDPServer.cs" />

                 <include name="Assets/InventoryCache.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 6cf254b..5a2a5c8 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -69,14 +69,14 @@ namespace OpenSim.Region.Communications.Local
             return profile;

         }

 

-        public override bool AuthenticateUser(ref UserProfileData profile, string password)

+        public override bool AuthenticateUser(UserProfileData profile, string password)

         {

             //for now we will accept any password in sandbox mode

             Console.WriteLine("authorising user");

             return true;

         }

 

-        public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser)

+        public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)

         {

             ulong currentRegion = theUser.currentAgent.currentHandle;

             RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);

diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index f9f6b7d..0a15a49 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,15 +98,15 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="LocalUserServices.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="CommunicationsLocal.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="LocalBackEndServices.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="LocalUserServices.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
index bfefabf..3cac9d3 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -11,9 +11,9 @@
             <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="LocalUserServices.cs" />

                 <include name="CommunicationsLocal.cs" />

                 <include name="LocalBackEndServices.cs" />

+                <include name="LocalUserServices.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 5f0c80c..2ac7297 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -75,18 +75,14 @@ namespace OpenSim.Region.Communications.OGS1
 

             foreach (Hashtable n in (Hashtable)respData.Values)

             {

-                RegionInfo neighbour = new RegionInfo();

+                RegionInfo neighbour = new RegionInfo( (uint)n["x"], (uint)n["y"], (string)n["sim_ip"], (int)n["sim_port"], (string)n["sim_uri"] );

 

                 //OGS1

-                neighbour.RegionHandle = (ulong)n["regionhandle"];

-                neighbour.RegionLocX = (uint)n["x"];

-                neighbour.RegionLocY = (uint)n["y"];

+                //neighbour.RegionHandle = (ulong)n["regionhandle"]; is now calculated locally

+

                 neighbour.RegionName = (string)n["name"];

 

                 //OGS1+

-                neighbour.CommsIPListenAddr = (string)n["sim_ip"];

-                neighbour.CommsIPListenPort = (int)n["sim_port"];

-                neighbour.CommsExternalAddress = (string)n["sim_uri"];

                 neighbour.SimUUID = (string)n["uuid"];

 

                 neighbours.Add(neighbour);

diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 90a01b6..d6abd13 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,9 +116,6 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="OGS1UserServices.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="CommunicationsOGS1.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -128,6 +125,9 @@
     <Compile Include="OGS1InterSimComms.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="OGS1UserServices.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Properties\AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 960a84a..04d61b9 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,10 +11,10 @@
             <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="OGS1UserServices.cs" />

                 <include name="CommunicationsOGS1.cs" />

                 <include name="OGS1GridServices.cs" />

                 <include name="OGS1InterSimComms.cs" />

+                <include name="OGS1UserServices.cs" />

                 <include name="Properties/AssemblyInfo.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 6dabd05..428f381 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -144,55 +144,55 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="RegionManager.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="EstateManager.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="ParcelManager.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="RegionManager.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="Scenes\Entity.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\Scene.cs">

+    <Compile Include="Scenes\IScenePresenceBody.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\ScenePresence.Body.cs">

+    <Compile Include="Scenes\Primitive.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\SceneEvents.cs">

+    <Compile Include="Scenes\Scene.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\ScenePresence.cs">

+    <Compile Include="Scenes\Scene.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\ScenePresence.Animations.cs">

+    <Compile Include="Scenes\SceneBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\Scene.PacketHandlers.cs">

+    <Compile Include="Scenes\SceneEvents.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Scenes\SceneObject.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\Primitive.cs">

+    <Compile Include="Scenes\ScenePresence.Animations.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\SceneBase.cs">

+    <Compile Include="Scenes\ScenePresence.Body.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\IScenePresenceBody.cs">

+    <Compile Include="Scenes\ScenePresence.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\scripting\ScriptManager.cs">

+    <Compile Include="Scenes\scripting\Script.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Scenes\scripting\ScriptInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\scripting\Script.cs">

+    <Compile Include="Scenes\scripting\ScriptManager.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">

diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index eb26ea0..2fa5e76 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -11,23 +11,23 @@
             <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="RegionManager.cs" />

                 <include name="EstateManager.cs" />

                 <include name="ParcelManager.cs" />

+                <include name="RegionManager.cs" />

                 <include name="Scenes/Entity.cs" />

+                <include name="Scenes/IScenePresenceBody.cs" />

+                <include name="Scenes/Primitive.cs" />

                 <include name="Scenes/Scene.cs" />

-                <include name="Scenes/ScenePresence.Body.cs" />

-                <include name="Scenes/SceneEvents.cs" />

-                <include name="Scenes/ScenePresence.cs" />

-                <include name="Scenes/ScenePresence.Animations.cs" />

                 <include name="Scenes/Scene.PacketHandlers.cs" />

-                <include name="Scenes/SceneObject.cs" />

-                <include name="Scenes/Primitive.cs" />

                 <include name="Scenes/SceneBase.cs" />

-                <include name="Scenes/IScenePresenceBody.cs" />

-                <include name="Scenes/scripting/ScriptManager.cs" />

-                <include name="Scenes/scripting/ScriptInfo.cs" />

+                <include name="Scenes/SceneEvents.cs" />

+                <include name="Scenes/SceneObject.cs" />

+                <include name="Scenes/ScenePresence.Animations.cs" />

+                <include name="Scenes/ScenePresence.Body.cs" />

+                <include name="Scenes/ScenePresence.cs" />

                 <include name="Scenes/scripting/Script.cs" />

+                <include name="Scenes/scripting/ScriptInfo.cs" />

+                <include name="Scenes/scripting/ScriptManager.cs" />

                 <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />

                 <include name="Scenes/scripting/Engines/JScriptEngine.cs" />

             </sources>

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8c912d0..d5406b6 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -493,19 +493,19 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="remoteClient"></param          

         /// <param name="agentID"></param>

         /// <param name="child"></param>

-        public override void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child)

+        public override void AddNewClient(IClientAPI client, bool child)

         {

-            remoteClient.OnRegionHandShakeReply += this.SendLayerData;

+            client.OnRegionHandShakeReply += this.SendLayerData;

             //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);

-            remoteClient.OnChatFromViewer += this.SimChat;

-            remoteClient.OnRequestWearables += this.InformClientOfNeighbours;

-            remoteClient.OnAddPrim += this.AddNewPrim;

-            remoteClient.OnUpdatePrimPosition += this.UpdatePrimPosition;

-            remoteClient.OnRequestMapBlocks += this.RequestMapBlocks;

-            remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation;

+            client.OnChatFromViewer += this.SimChat;

+            client.OnRequestWearables += this.InformClientOfNeighbours;

+            client.OnAddPrim += this.AddNewPrim;

+            client.OnUpdatePrimPosition += this.UpdatePrimPosition;

+            client.OnRequestMapBlocks += this.RequestMapBlocks;

+            client.OnTeleportLocationRequest += this.RequestTeleportLocation;

            //remoteClient.OnObjectSelect += this.SelectPrim;

-            remoteClient.OnGrapUpdate += this.MoveObject;

-            remoteClient.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;

+            client.OnGrapUpdate += this.MoveObject;

+            client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;

 

             /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);

             remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);

@@ -513,19 +513,21 @@ namespace OpenSim.Region.Environment.Scenes
             remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);

             remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);

             */

-            

+            this.estateManager.sendRegionHandshake(client);

+

+            CreateAndAddScenePresence(client);

+            return;

+        }

+

+        protected void CreateAndAddScenePresence(IClientAPI client)

+        {

             ScenePresence newAvatar = null;

-            try

-            {

 

-                OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");

-                newAvatar = new ScenePresence(remoteClient, this, this.m_regInfo);

+            OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");

+                newAvatar = new ScenePresence(client, this, this.m_regInfo);

                 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world");

                 OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Starting RegionHandshake ");

 

-                //newAvatar.SendRegionHandshake();

-                this.estateManager.sendRegionHandshake(remoteClient);

-

                 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);

                 lock (this.m_syncRoot)

                 {

@@ -534,36 +536,29 @@ namespace OpenSim.Region.Environment.Scenes
 

                 lock (Entities)

                 {

-                    if (!Entities.ContainsKey(agentID))

+                    if (!Entities.ContainsKey(client.AgentId))

                     {

-                        this.Entities.Add(agentID, newAvatar);

+                        this.Entities.Add(client.AgentId, newAvatar);

                     }

                     else

                     {

-                        Entities[agentID] = newAvatar;

+                        Entities[client.AgentId] = newAvatar;

                     }

                 }

                 lock (Avatars)

                 {

-                    if (Avatars.ContainsKey(agentID))

+                    if (Avatars.ContainsKey(client.AgentId))

                     {

-                        Avatars[agentID] = newAvatar;

+                        Avatars[client.AgentId] = newAvatar;

                     }

                     else

                     {

-                        this.Avatars.Add(agentID, newAvatar);

+                        this.Avatars.Add(client.AgentId, newAvatar);

                     }

                 }

-            }

-            catch (Exception e)

-            {

-                OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());

-            }

-            return;

         }

 

 

-

         /// <summary>

         /// 

         /// </summary>

@@ -642,8 +637,8 @@ namespace OpenSim.Region.Environment.Scenes
             this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo,gridSettings);

             if (this.regionCommsHost != null)

             {

-                this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection);

-                this.regionCommsHost.OnAvatarCrossingIntoRegion += new AgentCrossing(this.AgentCrossing);

+                this.regionCommsHost.OnExpectUser += this.NewUserConnection;

+                this.regionCommsHost.OnAvatarCrossingIntoRegion += this.AgentCrossing;

             }

         }

 

diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 50d3b82..e06acbd 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// <param name="remoteClient"></param>

         /// <param name="agentID"></param>

         /// <param name="child"></param>

-        public abstract void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child);

+        public abstract void AddNewClient(IClientAPI client, bool child);

         

         /// <summary>

         /// 

diff --git a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
index 89f39d3..fe1fc16 100644
--- a/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
+++ b/OpenSim/Region/Examples/SimpleApp/MyWorld.cs
@@ -44,7 +44,7 @@ namespace SimpleApp
 

         #region IWorld Members

 

-        override public void AddNewClient(IClientAPI client, LLUUID agentID, bool child)

+        override public void AddNewClient(IClientAPI client, bool child)

 

         {

             LLVector3 pos = new LLVector3(128, 128, 128);

@@ -59,7 +59,13 @@ namespace SimpleApp
                     };

             

             client.OnRequestWearables += SendWearables;

-

+            client.OnAddPrim += AddNewPrim;

+            client.OnUpdatePrimPosition += this.UpdatePrimPosition;

+            client.OnRequestMapBlocks += this.RequestMapBlocks;

+            client.OnTeleportLocationRequest += this.RequestTeleportLocation;

+            client.OnGrapUpdate += this.MoveObject;

+            client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;

+            

             client.OnCompleteMovementToRegion += delegate()

                 {

                     client.MoveAgentIntoRegion(m_regionInfo, pos, LLVector3.Zero );

@@ -76,7 +82,7 @@ namespace SimpleApp
 

             client.SendRegionHandshake(m_regionInfo);

 

-            OpenSim.Region.Environment.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo );

+            CreateAndAddScenePresence(client);

             

         }

 

@@ -85,12 +91,6 @@ namespace SimpleApp
             client.SendWearables( AvatarWearable.DefaultWearables );

         }

 

-

-       override public void RemoveClient(LLUUID agentID)

-        {

-

-        }

-

         public RegionInfo RegionInfo

         {

             get { return m_regionInfo; }

diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index 4060d68..0d5b4b3 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -14,6 +14,7 @@ using OpenSim.Region.Caches;
 using OpenSim.Framework.Communications;

 using OpenSim.Region.Communications.Local;

 using OpenSim.Region.ClientStack;

+using OpenSim.Region.Physics.BasicPhysicsPlugin;

 

 namespace SimpleApp

 {

@@ -32,11 +33,7 @@ namespace SimpleApp
 

             string simAddr = "127.0.0.1";

             int simPort = 9000;

-            /*

-            LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false );

-            loginServer.Startup();

-            loginServer.SetSessionHandler( AddNewSessionHandler );*/

-

+            

             m_circuitManager = new AuthenticateSessionsBase();

 

             InventoryCache inventoryCache = new InventoryCache();

@@ -53,18 +50,17 @@ namespace SimpleApp
             

             ClientView.TerrainManager = new TerrainManager(new SecondLife());

 

-            CommunicationsManager communicationsManager = new CommunicationsLocal(null);

+            NetworkServersInfo serverInfo = new NetworkServersInfo();

+            CommunicationsLocal communicationsManager = new CommunicationsLocal(serverInfo);

+

+            RegionInfo regionInfo = new RegionInfo( 1000, 1000, simAddr, simPort, simAddr );

             

-            RegionInfo regionInfo = new RegionInfo( );

             BaseHttpServer httpServer = new BaseHttpServer(simPort);

-            udpServer.LocalWorld = new MyWorld( packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer );

-

-            // World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo);            

-            // PhysicsScene physicsScene = new NullPhysicsScene();

-            // world.PhysicsScene = physicsScene;

-            // udpServer.LocalWorld = world;

+            MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);

+            world.PhysScene = new BasicScene();

+            udpServer.LocalWorld = world;

 

-          //  httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );

+            httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod );

             httpServer.Start();

             

             m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");

diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
index 0a82172..d39d091 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
@@ -104,6 +104,12 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

+    <ProjectReference Include="..\..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">

+      <Name>OpenSim.Framework.UserManagement</Name>

+      <Project>{586E2916-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

     <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj">

       <Name>OpenSim.Region.Caches</Name>

       <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>

@@ -134,6 +140,18 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

+    <ProjectReference Include="..\..\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj">

+      <Name>OpenSim.Region.Physics.BasicPhysicsPlugin</Name>

+      <Project>{15B4FEF3-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

+    <ProjectReference Include="..\..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">

+      <Name>OpenSim.Region.Physics.Manager</Name>

+      <Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="MyWorld.cs">

diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
index f8896fa..db44992 100644
--- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
+++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
@@ -25,11 +25,14 @@
                 <include name="../../../../bin/OpenSim.Framework.Communications.dll" />

                 <include name="../../../../bin/OpenSim.Framework.Console.dll" />

                 <include name="../../../../bin/OpenSim.Framework.Servers.dll" />

+                <include name="../../../../bin/OpenSim.Framework.UserManagement.dll" />

                 <include name="../../../../bin/OpenSim.Region.Caches.dll" />

                 <include name="../../../../bin/OpenSim.Region.ClientStack.dll" />

                 <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" />

                 <include name="../../../../bin/OpenSim.Region.Environment.dll" />

                 <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" />

+                <include name="../../../../bin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll" />

+                <include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />

                 <include name="System.dll" />

                 <include name="System.Data.dll.dll" />

                 <include name="System.Xml.dll" />

diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 716fd57..147158c 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -93,6 +93,9 @@
     <Compile Include="AssemblyInfo.cs">

       <SubType>Code</SubType>

     </Compile>

+    <Compile Include="Db4LocalStorage.cs">

+      <SubType>Code</SubType>

+    </Compile>

     <Compile Include="MapStorage.cs">

       <SubType>Code</SubType>

     </Compile>

@@ -102,9 +105,6 @@
     <Compile Include="UUIDPrimQuery.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Db4LocalStorage.cs">

-      <SubType>Code</SubType>

-    </Compile>

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

   <PropertyGroup>

diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
index 112ff1c..fc9f055 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
@@ -12,10 +12,10 @@
             </resources>

             <sources failonempty="true">

                 <include name="AssemblyInfo.cs" />

+                <include name="Db4LocalStorage.cs" />

                 <include name="MapStorage.cs" />

                 <include name="UUIDParcelQuery.cs" />

                 <include name="UUIDPrimQuery.cs" />

-                <include name="Db4LocalStorage.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

                 <lib>