Some more code refactoring, plus a restructuring of the directories so that the Grid servers can be a separate solution to the region server.

8 files changed, 0 insertions, 335 deletions

diff --git a/OpenSim.Framework/Types/AgentCiruitData.cs b/OpenSim.Framework/Types/AgentCiruitData.cs
deleted file mode 100644
index 7314586..0000000
--- a/OpenSim.Framework/Types/AgentCiruitData.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    public class AgentCircuitData

-    {

-        public AgentCircuitData() { }

-        public LLUUID AgentID;

-        public LLUUID SessionID;

-        public LLUUID SecureSessionID;

-        public LLVector3 startpos;

-        public string firstname;

-        public string lastname;

-        public uint circuitcode;

-        public bool child;

-        public LLUUID InventoryFolder;

-        public LLUUID BaseFolder;

-    }

-}

diff --git a/OpenSim.Framework/Types/AssetBase.cs b/OpenSim.Framework/Types/AssetBase.cs
deleted file mode 100644
index f6104f8..0000000
--- a/OpenSim.Framework/Types/AssetBase.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    public class AssetBase

-    {

-        public byte[] Data;

-        public LLUUID FullID;

-        public sbyte Type;

-        public sbyte InvType;

-        public string Name;

-        public string Description;

-

-        public AssetBase()

-        {

-

-        }

-    }

-}

diff --git a/OpenSim.Framework/Types/AssetLandmark.cs b/OpenSim.Framework/Types/AssetLandmark.cs
deleted file mode 100644
index 9d1a326..0000000
--- a/OpenSim.Framework/Types/AssetLandmark.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    public class AssetLandmark : AssetBase

-    {

-        public int Version;

-        public LLVector3 Position;

-        public LLUUID RegionID;

-

-        public AssetLandmark(AssetBase a)

-        {

-            this.Data = a.Data;

-            this.FullID = a.FullID;

-            this.Type = a.Type;

-            this.InvType = a.InvType;

-            this.Name = a.Name;

-            this.Description = a.Description;

-            InternData();

-        }

-

-        private void InternData()

-        {

-            string temp = System.Text.Encoding.UTF8.GetString(Data).Trim(); 

-            string[] parts = temp.Split('\n');

-            int.TryParse(parts[0].Substring(17, 1), out Version);

-            LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID);

-            LLVector3.TryParse(parts[2].Substring(11, parts[2].Length - 11), out Position);

-        }

-    }

-}

diff --git a/OpenSim.Framework/Types/AssetStorage.cs b/OpenSim.Framework/Types/AssetStorage.cs
deleted file mode 100644
index 5b5b3b2..0000000
--- a/OpenSim.Framework/Types/AssetStorage.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-        public class AssetStorage

-        {

-

-                public AssetStorage() {

-                }

-

-                public AssetStorage(LLUUID assetUUID) {

-                        UUID=assetUUID;

-                }

-

-                public byte[] Data;

-                public sbyte Type;

-                public string Name;

-                public LLUUID UUID;

-        }

-}

diff --git a/OpenSim.Framework/Types/Login.cs b/OpenSim.Framework/Types/Login.cs
deleted file mode 100644
index 71f9de3..0000000
--- a/OpenSim.Framework/Types/Login.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    public class Login

-    {

-        public string First = "Test";

-        public string Last = "User";

-        public LLUUID Agent;

-        public LLUUID Session;

-        public LLUUID SecureSession = LLUUID.Zero;

-        public LLUUID InventoryFolder;

-        public LLUUID BaseFolder;

-        public uint CircuitCode;

-

-        public Login()

-        {

-

-        }

-    }

-}

diff --git a/OpenSim.Framework/Types/NeighbourInfo.cs b/OpenSim.Framework/Types/NeighbourInfo.cs
deleted file mode 100644
index 58b6cb1..0000000
--- a/OpenSim.Framework/Types/NeighbourInfo.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Framework.Types

-{

-    public class NeighbourInfo

-    {

-        public NeighbourInfo()

-        {

-        }

-

-        public ulong regionhandle;

-        public uint RegionLocX;

-        public uint RegionLocY;

-        public string sim_ip;

-        public uint sim_port;

-    }

-}

diff --git a/OpenSim.Framework/Types/OSVector3.cs b/OpenSim.Framework/Types/OSVector3.cs
deleted file mode 100644
index 8fb840b..0000000
--- a/OpenSim.Framework/Types/OSVector3.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-

-namespace OpenSim.Framework.Types

-{

-    public class OSVector3

-    {

-        public float X;

-        public float Y;

-        public float Z;

-

-        public OSVector3()

-        {

-

-        }

-    }

-}

diff --git a/OpenSim.Framework/Types/PrimData.cs b/OpenSim.Framework/Types/PrimData.cs
deleted file mode 100644
index 68e2a22..0000000
--- a/OpenSim.Framework/Types/PrimData.cs
+++ /dev/null
@@ -1,173 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Text;

-using libsecondlife;

-

-namespace OpenSim.Framework.Types

-{

-    public class PrimData

-    {

-        private const uint FULL_MASK_PERMISSIONS = 2147483647;

-

-        public LLUUID OwnerID;

-        public byte PCode;

-        public ushort PathBegin;

-        public ushort PathEnd;

-        public byte PathScaleX;

-        public byte PathScaleY;

-        public byte PathShearX;

-        public byte PathShearY;

-        public sbyte PathSkew;

-        public ushort ProfileBegin;

-        public ushort ProfileEnd;

-        public LLVector3 Scale;

-        public byte PathCurve;

-        public byte ProfileCurve;

-        public uint ParentID = 0;

-        public ushort ProfileHollow;

-        public sbyte PathRadiusOffset;

-        public byte PathRevolutions;

-        public sbyte PathTaperX;

-        public sbyte PathTaperY;

-        public sbyte PathTwist;

-        public sbyte PathTwistBegin;

-        public byte[] Texture;

-       

-

-        public Int32 CreationDate;

-        public uint OwnerMask = FULL_MASK_PERMISSIONS;

-        public uint NextOwnerMask = FULL_MASK_PERMISSIONS;

-        public uint GroupMask = FULL_MASK_PERMISSIONS;

-        public uint EveryoneMask = FULL_MASK_PERMISSIONS;

-        public uint BaseMask = FULL_MASK_PERMISSIONS;

-

-        //following only used during prim storage

-        public LLVector3 Position;

-        public LLQuaternion Rotation = new LLQuaternion(0,1,0,0);

-        public uint LocalID;

-        public LLUUID FullID;

-

-        public PrimData()

-        {

-

-        }

-

-        public PrimData(byte[] data)

-        {

-            int i =0;

-

-            this.OwnerID = new LLUUID(data, i); i += 16;

-            this.PCode = data[i++];

-            this.PathBegin = (ushort)(data[i++] + (data[i++] << 8));

-            this.PathEnd = (ushort)(data[i++] + (data[i++] << 8));

-            this.PathScaleX = data[i++];

-            this.PathScaleY = data[i++];

-            this.PathShearX = data[i++];

-            this.PathShearY = data[i++];

-            this.PathSkew = (sbyte)data[i++];

-            this.ProfileBegin = (ushort)(data[i++] + (data[i++] << 8));

-            this.ProfileEnd = (ushort)(data[i++] + (data[i++] << 8));

-            this.Scale = new LLVector3(data, i); i += 12;

-            this.PathCurve = data[i++];

-            this.ProfileCurve = data[i++];

-            this.ParentID = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.ProfileHollow = (ushort)(data[i++] + (data[i++] << 8));

-            this.PathRadiusOffset = (sbyte)data[i++];

-            this.PathRevolutions = data[i++];

-            this.PathTaperX = (sbyte)data[i++];

-            this.PathTaperY =(sbyte) data[i++];

-            this.PathTwist = (sbyte) data[i++];

-            this.PathTwistBegin = (sbyte) data[i++];

-            ushort length = (ushort)(data[i++] + (data[i++] << 8));

-            this.Texture = new byte[length];

-            Array.Copy(data, i, Texture, 0, length); i += length;

-            this.CreationDate = (Int32)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.OwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.NextOwnerMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.GroupMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.EveryoneMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.BaseMask = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.Position = new LLVector3(data, i); i += 12;

-            this.Rotation = new LLQuaternion(data,i, true); i += 12;

-            this.LocalID = (uint)(data[i++] + (data[i++] << 8) + (data[i++] << 16) + (data[i++] << 24));

-            this.FullID = new LLUUID(data, i); i += 16;

-

-        }

-

-        public byte[] ToBytes()

-        {

-            int i = 0;

-            byte[] bytes = new byte[126 + Texture.Length];

-            Array.Copy(OwnerID.GetBytes(), 0, bytes, i, 16); i += 16;

-            bytes[i++] = this.PCode;

-            bytes[i++] = (byte)(this.PathBegin % 256);

-            bytes[i++] = (byte)((this.PathBegin >> 8) % 256);

-            bytes[i++] = (byte)(this.PathEnd % 256);

-            bytes[i++] = (byte)((this.PathEnd >> 8) % 256);

-            bytes[i++] = this.PathScaleX;

-            bytes[i++] = this.PathScaleY;

-            bytes[i++] = this.PathShearX;

-            bytes[i++] = this.PathShearY;

-            bytes[i++] = (byte)this.PathSkew;

-            bytes[i++] = (byte)(this.ProfileBegin % 256);

-            bytes[i++] = (byte)((this.ProfileBegin >> 8) % 256);

-            bytes[i++] = (byte)(this.ProfileEnd % 256);

-            bytes[i++] = (byte)((this.ProfileEnd >> 8) % 256);

-            Array.Copy(Scale.GetBytes(), 0, bytes, i, 12); i += 12;

-            bytes[i++] = this.PathCurve;

-            bytes[i++] = this.ProfileCurve;

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

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

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

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

-            bytes[i++] = (byte)(this.ProfileHollow %256);

-            bytes[i++] = (byte)((this.ProfileHollow >> 8)% 256);

-            bytes[i++] = ((byte)this.PathRadiusOffset);

-            bytes[i++] = this.PathRevolutions;

-            bytes[i++] = ((byte) this.PathTaperX);

-            bytes[i++] = ((byte) this.PathTaperY);

-            bytes[i++] = ((byte) this.PathTwist);

-            bytes[i++] = ((byte) this.PathTwistBegin);

-            bytes[i++] = (byte)(Texture.Length % 256);

-            bytes[i++] = (byte)((Texture.Length >> 8) % 256);

-            Array.Copy(Texture, 0, bytes, i, Texture.Length); i += Texture.Length;

-            bytes[i++] = (byte)(this.CreationDate % 256);

-            bytes[i++] = (byte)((this.CreationDate >> 8) % 256);

-            bytes[i++] = (byte)((this.CreationDate >> 16) % 256);

-            bytes[i++] = (byte)((this.CreationDate >> 24) % 256);

-            bytes[i++] = (byte)(this.OwnerMask % 256);

-            bytes[i++] = (byte)((this.OwnerMask >> 8) % 256);

-            bytes[i++] = (byte)((this.OwnerMask >> 16) % 256);

-            bytes[i++] = (byte)((this.OwnerMask >> 24) % 256);

-            bytes[i++] = (byte)(this.NextOwnerMask % 256);

-            bytes[i++] = (byte)((this.NextOwnerMask >> 8) % 256);

-            bytes[i++] = (byte)((this.NextOwnerMask >> 16) % 256);

-            bytes[i++] = (byte)((this.NextOwnerMask >> 24) % 256);

-            bytes[i++] = (byte)(this.GroupMask % 256);

-            bytes[i++] = (byte)((this.GroupMask >> 8) % 256);

-            bytes[i++] = (byte)((this.GroupMask >> 16) % 256);

-            bytes[i++] = (byte)((this.GroupMask >> 24) % 256);

-            bytes[i++] = (byte)(this.EveryoneMask % 256);

-            bytes[i++] = (byte)((this.EveryoneMask >> 8) % 256);

-            bytes[i++] = (byte)((this.EveryoneMask >> 16) % 256);

-            bytes[i++] = (byte)((this.EveryoneMask >> 24) % 256);

-            bytes[i++] = (byte)(this.BaseMask % 256);

-            bytes[i++] = (byte)((this.BaseMask >> 8) % 256);

-            bytes[i++] = (byte)((this.BaseMask >> 16) % 256);

-            bytes[i++] = (byte)((this.BaseMask >> 24) % 256);

-            Array.Copy(this.Position.GetBytes(), 0, bytes, i, 12); i += 12;

-            if (this.Rotation == new LLQuaternion(0,0,0,0))

-            {

-                this.Rotation = new LLQuaternion(0, 1, 0, 0);

-            }

-            Array.Copy(this.Rotation.GetBytes(), 0, bytes, i, 12); i += 12;

-            bytes[i++] = (byte)(this.LocalID % 256);

-            bytes[i++] = (byte)((this.LocalID >> 8) % 256);

-            bytes[i++] = (byte)((this.LocalID >> 16) % 256);

-            bytes[i++] = (byte)((this.LocalID >> 24) % 256);

-            Array.Copy(FullID.GetBytes(), 0, bytes, i, 16); i += 16;

-

-            return bytes;

-        }

-    }

-}