Prim creation working.

10 files changed, 132 insertions, 192 deletions

diff --git a/OpenSim/OpenSim.Region/World/Avatar.cs b/OpenSim/OpenSim.Region/World/Avatar.cs
index 88a7969..65af5a6 100644
--- a/OpenSim/OpenSim.Region/World/Avatar.cs
+++ b/OpenSim/OpenSim.Region/World/Avatar.cs
@@ -66,7 +66,6 @@ namespace OpenSim.Region
             Wearables = AvatarWearable.DefaultWearables;

             

             this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));

-            Console.WriteLine("avatar point 4");

             

             //register for events

             ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance);

@@ -77,14 +76,7 @@ namespace OpenSim.Region
             ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack);

             ControllingClient.OnChildAgentStatus += new StatusChange(this.ChildStatusChange);

             ControllingClient.OnStopMovement += new GenericCall2(this.StopMovement);

-             * */

-

-            ControllingClient.OnParcelPropertiesRequest +=new ParcelPropertiesRequest(this.m_world.parcelManager.handleParcelPropertiesRequest);

-            ControllingClient.OnParcelDivideRequest += new ParcelDivideRequest(this.m_world.parcelManager.handleParcelDivideRequest);

-            ControllingClient.OnParcelJoinRequest += new ParcelJoinRequest(this.m_world.parcelManager.handleParcelJoinRequest);

-            ControllingClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(this.m_world.parcelManager.handleParcelPropertiesUpdateRequest);

-

-            ControllingClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(this.m_world.estateManager.handleEstateOwnerMessage);

+             */

         }

 

         /// <summary>

diff --git a/OpenSim/OpenSim.Region/World/Primitive.cs b/OpenSim/OpenSim.Region/World/Primitive.cs
index 1f70550..d540a3b 100644
--- a/OpenSim/OpenSim.Region/World/Primitive.cs
+++ b/OpenSim/OpenSim.Region/World/Primitive.cs
@@ -14,12 +14,12 @@ namespace OpenSim.Region
     public class Primitive : Entity

     {

         protected PrimData primData;

-        //private ObjectUpdatePacket OurPacket;

         private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);

         private Dictionary<uint, IClientAPI> m_clientThreads;

         private ulong m_regionHandle;

         private const uint FULL_MASK_PERMISSIONS = 2147483647;

         private bool physicsEnabled = false;

+        private byte updateFlag = 0;

 

         private Dictionary<LLUUID, InventoryItem> inventoryItems;

 

@@ -66,7 +66,7 @@ namespace OpenSim.Region
             inventoryItems = new Dictionary<LLUUID, InventoryItem>();

         }

 

-        public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world, LLUUID owner)

+        public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world, LLUUID owner, LLUUID fullID, uint localID)

         {

             m_clientThreads = clientThreads;

             m_regionHandle = regionHandle;

@@ -75,8 +75,34 @@ namespace OpenSim.Region
             this.primData = new PrimData();

             this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;

             this.primData.OwnerID = owner;

+            this.primData.FullID = this.uuid = fullID;

+            this.primData.LocalID = this.localid = localID;

         }

 

+        /// <summary>

+        /// Constructor to create a default cube 

+        /// </summary>

+        /// <param name="clientThreads"></param>

+        /// <param name="regionHandle"></param>

+        /// <param name="world"></param>

+        /// <param name="owner"></param>

+        /// <param name="localID"></param>

+        /// <param name="position"></param>

+        public Primitive(Dictionary<uint, IClientAPI> clientThreads, ulong regionHandle, World world, LLUUID owner, uint localID, LLVector3 position)

+        {

+            m_clientThreads = clientThreads;

+            m_regionHandle = regionHandle;

+            m_world = world;

+            inventoryItems = new Dictionary<LLUUID, InventoryItem>();

+            this.primData = PrimData.DefaultCube();

+            this.primData.OwnerID = owner;

+            this.primData.LocalID = this.localid = localID;

+            this.Pos = this.primData.Position = position;

+

+            this.updateFlag = 1;

+        }

+

+

         public byte[] GetByteArray()

         {

             byte[] result = null;

@@ -115,7 +141,11 @@ namespace OpenSim.Region
 

         public override void update()

         {

-            LLVector3 pos2 = new LLVector3(0, 0, 0);

+            if (this.updateFlag == 1)

+            {

+                this.SendFullUpdateToAllClients();

+                this.updateFlag = 0;

+            }

         }

 

         public override void BackUp()

@@ -275,17 +305,39 @@ namespace OpenSim.Region
 

         public void SendFullUpdateToAllClients()

         {

-

+            List<Avatar> avatars = this.m_world.RequestAvatarList();

+            for (int i = 0; i < avatars.Count; i++)

+            {

+                this.SendFullUpdateToClient(avatars[i].ControllingClient);

+            }

         }

 

         public void SendTerseUpdateToClient(IClientAPI RemoteClient)

         {

+            LLVector3 lPos;

+            Axiom.MathLib.Quaternion lRot;

+            if (this._physActor != null && this.physicsEnabled)

+            {

+                PhysicsVector pPos = this._physActor.Position;

+                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);

+                lRot = this._physActor.Orientation;

+            }

+            else

+            {

+                lPos = this.Pos;

+                lRot = this.rotation;

+            }

 

+           

         }

 

         public void SendTerseUpdateToALLClients()

         {

-

+            List<Avatar> avatars = this.m_world.RequestAvatarList();

+            for (int i = 0; i < avatars.Count; i++)

+            {

+                this.SendTerseUpdateToClient(avatars[i].ControllingClient);

+            }

         }

 

         #endregion

@@ -324,6 +376,8 @@ namespace OpenSim.Region
             this.primData.FullID = this.uuid = LLUUID.Random();

             this.localid = (uint)(localID);

             this.primData.Position = this.Pos = pos1;

+

+            this.updateFlag = 1;

         }

 

         public void CreateFromBytes(byte[] data)

@@ -343,82 +397,5 @@ namespace OpenSim.Region
 

         #endregion

 

-

-        protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock()

-        {

-            uint ID = this.localid;

-            byte[] bytes = new byte[60];

-

-            int i = 0;

-            ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();

-            dat.TextureEntry = new byte[0];

-            bytes[i++] = (byte)(ID % 256);

-            bytes[i++] = (byte)((ID >> 8) % 256);

-            bytes[i++] = (byte)((ID >> 16) % 256);

-            bytes[i++] = (byte)((ID >> 24) % 256);

-            bytes[i++] = 0;

-            bytes[i++] = 0;

-

-            LLVector3 lPos;

-            Axiom.MathLib.Quaternion lRot;

-            if (this._physActor != null && this.physicsEnabled)

-            {

-                PhysicsVector pPos = this._physActor.Position;

-                lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);

-                lRot = this._physActor.Orientation;

-            }

-            else

-            {

-                lPos = this.Pos;

-                lRot = this.rotation;

-            }

-            byte[] pb = lPos.GetBytes();

-            Array.Copy(pb, 0, bytes, i, pb.Length);

-            i += 12;

-            ushort ac = 32767;

-

-            //vel

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-

-            //accel

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-

-            ushort rw, rx, ry, rz;

-            rw = (ushort)(32768 * (lRot.w + 1));

-            rx = (ushort)(32768 * (lRot.x + 1));

-            ry = (ushort)(32768 * (lRot.y + 1));

-            rz = (ushort)(32768 * (lRot.z + 1));

-

-            //rot

-            bytes[i++] = (byte)(rx % 256);

-            bytes[i++] = (byte)((rx >> 8) % 256);

-            bytes[i++] = (byte)(ry % 256);

-            bytes[i++] = (byte)((ry >> 8) % 256);

-            bytes[i++] = (byte)(rz % 256);

-            bytes[i++] = (byte)((rz >> 8) % 256);

-            bytes[i++] = (byte)(rw % 256);

-            bytes[i++] = (byte)((rw >> 8) % 256);

-

-            //rotation vel

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-            bytes[i++] = (byte)(ac % 256);

-            bytes[i++] = (byte)((ac >> 8) % 256);

-

-            dat.Data = bytes;

-            return dat;

-        }

     }

 }

diff --git a/OpenSim/OpenSim.Region/World/World.cs b/OpenSim/OpenSim.Region/World/World.cs
index c5c554d..49ba8fa 100644
--- a/OpenSim/OpenSim.Region/World/World.cs
+++ b/OpenSim/OpenSim.Region/World/World.cs
@@ -450,7 +450,19 @@ namespace OpenSim.Region
         /// <param name="ownerID"></param>

         public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)

         {

-

+            try

+            {

+               // MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");

+                Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this);

+                prim.CreateFromPacket(addPacket, ownerID, this._primCount);

+                

+                this.Entities.Add(prim.uuid, prim);

+                this._primCount++;

+            }

+            catch (Exception e)

+            {

+               // MainConsole.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());

+            }

         }

 

         #endregion

@@ -469,6 +481,15 @@ namespace OpenSim.Region
             //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);

             remoteClient.OnChatFromViewer += new ChatFromViewer(this.SimChat);

             remoteClient.OnRequestWearables += new GenericCall(this.InformClientOfNeighbours);

+            remoteClient.OnAddPrim += new GenericCall4(this.AddNewPrim);

+

+            /*

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

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

+            remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);

+            remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);

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

+            */

 

             Avatar newAvatar = null;

             try

diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
deleted file mode 100644
index 4db7ccb..0000000
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-using OpenSim.Framework.Types;

-using OpenSim.Framework;

-

-namespace OpenSim

-{

-    public class AuthenticateSessionsLocal : AuthenticateSessionsBase

-    {

-        public AuthenticateSessionsLocal()

-        {

-

-        }

-    

-        public bool AddNewSessionHandler(ulong regionHandle, Login loginData)

-        {

-            AddNewSession( loginData );

-            return true;

-        }

-        

-        public void AddNewSession(Login loginData)

-        {

-            AgentCircuitData agent = new AgentCircuitData();

-            agent.AgentID = loginData.Agent;

-            agent.firstname = loginData.First;

-            agent.lastname = loginData.Last;

-            agent.SessionID = loginData.Session;

-            agent.SecureSessionID = loginData.SecureSession;

-            agent.circuitcode = loginData.CircuitCode;

-            agent.BaseFolder = loginData.BaseFolder;

-            agent.InventoryFolder = loginData.InventoryFolder;

-            agent.startpos = new LLVector3(128,128,70);

-            this.AddNewCircuit(agent.circuitcode, agent);

-        }

-    }

-}

diff --git a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
deleted file mode 100644
index 13bce0e..0000000
--- a/OpenSim/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;

-using System.Collections;

-using System.Collections.Generic;

-using System.Text;

-using System.Xml;

-using libsecondlife;

-using OpenSim.Framework.Types;

-using OpenSim.Framework;

-using Nwc.XmlRpc;

-

-namespace OpenSim

-{

-    public class AuthenticateSessionsRemote : AuthenticateSessionsBase

-    {

-        public AuthenticateSessionsRemote()

-        {

-

-        }

-

-        public XmlRpcResponse ExpectUser(XmlRpcRequest request)

-        {

-            return new XmlRpcResponse();

-        }

-    }

-}

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index 9fb52c6..d069f51 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -91,19 +91,28 @@ namespace OpenSim
             {

                 if (multipleupdate.ObjectData[i].Type == 9) //change position

                 {

-                    libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);

-                    OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);

+                    if (OnUpdatePrimPosition != null)

+                    {

+                        libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);

+                        OnUpdatePrimPosition(multipleupdate.ObjectData[i].ObjectLocalID, pos, this);

+                    }

                     //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);

-                    OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);

+                    if (OnUpdatePrimRotation != null)

+                    {

+                        libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);

+                        OnUpdatePrimRotation(multipleupdate.ObjectData[i].ObjectLocalID, rot, this);

+                    }

                 }

                 else if (multipleupdate.ObjectData[i].Type == 13)//scale

                 {

-                    libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);

-                    OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);

+                    if (OnUpdatePrimScale != null)

+                    {

+                        libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);

+                        OnUpdatePrimScale(multipleupdate.ObjectData[i].ObjectLocalID, scale, this);

+                    }

                 }

             }

             return true;

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index d36e579..00f3b66 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -488,7 +488,10 @@ namespace OpenSim
                     #region Estate Packets

                     case PacketType.EstateOwnerMessage:

                         EstateOwnerMessagePacket messagePacket = (EstateOwnerMessagePacket)Pack;

-                        OnEstateOwnerMessage(messagePacket, this);

+                        if (OnEstateOwnerMessage != null)

+                        {

+                            OnEstateOwnerMessage(messagePacket, this);

+                        }

                         break;

                     #endregion

                     #region unimplemented handlers

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index f9a7fe4..809d3cf 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -69,7 +69,7 @@ namespace OpenSim
 

         private AgentAssetUpload UploadAssets;

         private LLUUID newAssetFolder = LLUUID.Zero;

-        private bool debug = false;

+        private bool debug = true;

         protected IWorld m_world;

         private Dictionary<uint, ClientView> m_clientThreads;

         private AssetCache m_assetCache;

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 990b5c3..04febf0 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -6,7 +6,8 @@
     <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon></ApplicationIcon>

+    <ApplicationIcon>

+    </ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.RegionServer</AssemblyName>

@@ -15,9 +16,11 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder></AppDesignerFolder>

+    <AppDesignerFolder>

+    </AppDesignerFolder>

     <RootNamespace>OpenSim.RegionServer</RootNamespace>

-    <StartupObject></StartupObject>

+    <StartupObject>

+    </StartupObject>

     <FileUpgradeFlags>

     </FileUpgradeFlags>

   </PropertyGroup>

@@ -28,7 +31,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE;DEBUG</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>True</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>False</Optimize>

@@ -37,7 +41,8 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

     <AllowUnsafeBlocks>False</AllowUnsafeBlocks>

@@ -46,7 +51,8 @@
     <ConfigurationOverrideFile>

     </ConfigurationOverrideFile>

     <DefineConstants>TRACE</DefineConstants>

-    <DocumentationFile></DocumentationFile>

+    <DocumentationFile>

+    </DocumentationFile>

     <DebugSymbols>False</DebugSymbols>

     <FileAlignment>4096</FileAlignment>

     <Optimize>True</Optimize>

@@ -55,26 +61,27 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn></NoWarn>

+    <NoWarn>

+    </NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System" >

+    <Reference Include="System">

       <HintPath>System.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="System.Xml" >

+    <Reference Include="System.Xml">

       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="libsecondlife.dll" >

+    <Reference Include="libsecondlife.dll">

       <HintPath>..\..\bin\libsecondlife.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="Axiom.MathLib.dll" >

+    <Reference Include="Axiom.MathLib.dll">

       <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="Db4objects.Db4o.dll" >

+    <Reference Include="Db4objects.Db4o.dll">

       <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>

       <Private>False</Private>

     </Reference>

@@ -84,55 +91,49 @@
       <Name>OpenSim.Terrain.BasicTerrain</Name>

       <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>

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

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">

       <Name>OpenSim.Framework</Name>

       <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>

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

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">

       <Name>OpenSim.Framework.Console</Name>

       <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>

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

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">

       <Name>OpenSim.GenericConfig.Xml</Name>

       <Project>{E88EF749-0000-0000-0000-000000000000}</Project>

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

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

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

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

       <Project>{8BE16150-0000-0000-0000-000000000000}</Project>

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

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">

       <Name>OpenSim.Servers</Name>

       <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>

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

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

     <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">

       <Name>XMLRPC</Name>

       <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>

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

-                        <Private>False</Private>

+      <Private>False</Private>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="AgentAssetUpload.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="AuthenticateSessionsLocal.cs">

-      <SubType>Code</SubType>

-    </Compile>

-    <Compile Include="AuthenticateSessionsRemote.cs">

-      <SubType>Code</SubType>

-    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

@@ -192,4 +193,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>

+</Project>
\ No newline at end of file
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index e1f6281..bd07c8f 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -212,13 +212,13 @@ namespace OpenSim
                 regionDat = new RegionInfo();

                 if (m_sandbox)

                 {

-                    AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();

+                    AuthenticateSessionsBase authen = new AuthenticateSessionsBase();  // new AuthenticateSessionsLocal();

                     this.AuthenticateSessionsHandler.Add(authen);

                     authenBase = authen;

                 }

                 else

                 {

-                    AuthenticateSessionsRemote authen = new AuthenticateSessionsRemote();

+                    AuthenticateSessionsBase authen = new AuthenticateSessionsBase(); //new AuthenticateSessionsRemote();

                     this.AuthenticateSessionsHandler.Add (authen);

                     authenBase = authen;

                 }