76 files changed, 2983 insertions, 1839 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 5a9eeb5..ebb00d2 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -173,6 +173,7 @@ namespace OpenSim.Framework
        /// Position the Agent's Avatar starts in the region
        /// </summary>
        public Vector3 startpos;
+        public float startfar = -1.0f;
        public Dictionary<string, object> ServiceURLs;
@@ -219,6 +220,8 @@ namespace OpenSim.Framework
            args["channel"] = OSD.FromString(Channel);
            args["mac"] = OSD.FromString(Mac);
            args["id0"] = OSD.FromString(Id0);
+            if(startfar > 0)
+                args["far"] = OSD.FromReal(startfar);
            if (Appearance != null)
            {
@@ -264,16 +267,17 @@ namespace OpenSim.Framework
        /// <param name="args"></param>
        public void UnpackAgentCircuitData(OSDMap args)
        {
-            if (args["agent_id"] != null)
+            OSD tmpOSD;
-                AgentID = args["agent_id"].AsUUID();
+            if (args.TryGetValue("agent_id", out tmpOSD))
-            if (args["base_folder"] != null)
+                AgentID = tmpOSD.AsUUID();
-                BaseFolder = args["base_folder"].AsUUID();
+            if (args.TryGetValue("base_folder", out tmpOSD))
-            if (args["caps_path"] != null)
+                BaseFolder =tmpOSD.AsUUID();
-                CapsPath = args["caps_path"].AsString();
+            if (args.TryGetValue("caps_path", out tmpOSD))
+                CapsPath = tmpOSD.AsString();
-            if ((args["children_seeds"] != null) && (args["children_seeds"].Type == OSDType.Array))
+            if ((args.TryGetValue("children_seeds", out tmpOSD) && tmpOSD is OSDArray))
            {
-                OSDArray childrenSeeds = (OSDArray)(args["children_seeds"]);
+                OSDArray childrenSeeds = (OSDArray)tmpOSD;
                ChildrenCapSeeds = new Dictionary<ulong, string>();
                foreach (OSD o in childrenSeeds)
                {
@@ -282,50 +286,59 @@ namespace OpenSim.Framework
                        ulong handle = 0;
                        string seed = "";
                        OSDMap pair = (OSDMap)o;
-                        if (pair["handle"] != null)
+                        if (pair.TryGetValue("handle", out tmpOSD))
-                            if (!UInt64.TryParse(pair["handle"].AsString(), out handle))
+                        {
+                            if (!UInt64.TryParse(tmpOSD.AsString(), out handle))
                                continue;
-                        if (pair["seed"] != null)
+                        }
-                            seed = pair["seed"].AsString();
                        if (!ChildrenCapSeeds.ContainsKey(handle))
-                            ChildrenCapSeeds.Add(handle, seed);
+                        {
+                            if (pair.TryGetValue("seed", out tmpOSD))
+                            {
+                                seed = tmpOSD.AsString();
+                                ChildrenCapSeeds.Add(handle, seed);
+                            }
+                        }
                    }
                }
            }
            else
                ChildrenCapSeeds = new Dictionary<ulong, string>();
-            if (args["child"] != null)
+            if (args.TryGetValue("child", out tmpOSD))
-                child = args["child"].AsBoolean();
+                child = tmpOSD.AsBoolean();
-            if (args["circuit_code"] != null)
+            if (args.TryGetValue("circuit_code", out tmpOSD))
-                UInt32.TryParse(args["circuit_code"].AsString(), out circuitcode);
+                UInt32.TryParse(tmpOSD.AsString(), out circuitcode);
-            if (args["first_name"] != null)
+            if (args.TryGetValue("first_name", out tmpOSD))
-                firstname = args["first_name"].AsString();
+                firstname = tmpOSD.AsString();
-            if (args["last_name"] != null)
+            if (args.TryGetValue("last_name", out tmpOSD))
-                lastname = args["last_name"].AsString();
+                lastname = tmpOSD.AsString();
-            if (args["inventory_folder"] != null)
+            if (args.TryGetValue("inventory_folder", out tmpOSD))
-                InventoryFolder = args["inventory_folder"].AsUUID();
+                InventoryFolder = tmpOSD.AsUUID();
-            if (args["secure_session_id"] != null)
+            if (args.TryGetValue("secure_session_id", out tmpOSD))
-                SecureSessionID = args["secure_session_id"].AsUUID();
+                SecureSessionID = tmpOSD.AsUUID();
-            if (args["session_id"] != null)
+            if (args.TryGetValue("session_id", out tmpOSD))
-                SessionID = args["session_id"].AsUUID();
+                SessionID = tmpOSD.AsUUID();
-            if (args["service_session_id"] != null)
+            if (args.TryGetValue("service_session_id", out tmpOSD))
-                ServiceSessionID = args["service_session_id"].AsString();
+                ServiceSessionID = tmpOSD.AsString();
-            if (args["client_ip"] != null)
+            if (args.TryGetValue("client_ip", out tmpOSD))
-                IPAddress = args["client_ip"].AsString();
+                IPAddress = tmpOSD.AsString();
-            if (args["viewer"] != null)
+            if (args.TryGetValue("viewer", out tmpOSD))
-                Viewer = args["viewer"].AsString();
+                Viewer = tmpOSD.AsString();
-            if (args["channel"] != null)
+            if (args.TryGetValue("channel", out tmpOSD))
-                Channel = args["channel"].AsString();
+                Channel = tmpOSD.AsString();
-            if (args["mac"] != null)
+            if (args.TryGetValue("mac", out tmpOSD))
-                Mac = args["mac"].AsString();
+                Mac = tmpOSD.AsString();
-            if (args["id0"] != null)
+            if (args.TryGetValue("id0", out tmpOSD))
-                Id0 = args["id0"].AsString();
+                Id0 = tmpOSD.AsString();
-            if (args["teleport_flags"] != null)
+            if (args.TryGetValue("teleport_flags", out tmpOSD))
-                teleportFlags = args["teleport_flags"].AsUInteger();
+                teleportFlags = tmpOSD.AsUInteger();
-            if (args["start_pos"] != null)
+            if (args.TryGetValue("start_pos", out tmpOSD))
-                Vector3.TryParse(args["start_pos"].AsString(), out startpos);
+                Vector3.TryParse(tmpOSD.AsString(), out startpos);
+            if(args.TryGetValue("far", out tmpOSD))
+                startfar = (float)tmpOSD.AsReal();
            //m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos);
@@ -336,12 +349,12 @@ namespace OpenSim.Framework
                // Eventually this code should be deprecated, use full appearance
                // packing in packed_appearance
-                if (args["appearance_serial"] != null)
+                if (args.TryGetValue("appearance_serial", out tmpOSD))
-                    Appearance.Serial = args["appearance_serial"].AsInteger();
+                    Appearance.Serial = tmpOSD.AsInteger();
-                if (args.ContainsKey("packed_appearance") && (args["packed_appearance"].Type == OSDType.Map))
+                if (args.TryGetValue("packed_appearance", out tmpOSD) && (tmpOSD is OSDMap))
                {
-                    Appearance.Unpack((OSDMap)args["packed_appearance"]);
+                    Appearance.Unpack((OSDMap)tmpOSD);
 //                    m_log.InfoFormat("[AGENTCIRCUITDATA] unpacked appearance");
                }
                else
@@ -356,31 +369,29 @@ namespace OpenSim.Framework
            ServiceURLs = new Dictionary<string, object>();
            // Try parse the new way, OSDMap
-            if (args.ContainsKey("serviceurls") && args["serviceurls"] != null && (args["serviceurls"]).Type == OSDType.Map)
+            if (args.TryGetValue("serviceurls", out tmpOSD) && (tmpOSD is OSDMap))
            {
-                OSDMap urls = (OSDMap)(args["serviceurls"]);
+                OSDMap urls = (OSDMap)tmpOSD;
                foreach (KeyValuePair<String, OSD> kvp in urls)
                {
-                    ServiceURLs[kvp.Key] = kvp.Value.AsString();
+                    ServiceURLs[kvp.Key] = kvp.Value;
                    //System.Console.WriteLine("XXX " + kvp.Key + "=" + ServiceURLs[kvp.Key]);
                }
            }
            // else try the old way, OSDArray
            // OBSOLETE -- soon to be deleted
-            else if (args.ContainsKey("service_urls") && args["service_urls"] != null && (args["service_urls"]).Type == OSDType.Array)
+            else if (args.TryGetValue("service_urls", out tmpOSD) && (tmpOSD is OSDArray))
            {
-                OSDArray urls = (OSDArray)(args["service_urls"]);
+                OSDArray urls = (OSDArray)tmpOSD;
-                for (int i = 0; i < urls.Count / 2; i++)
+                OSD tmpOSDb;
+                for (int i = 0; i < urls.Count - 1; i += 2)
                {
-                    ServiceURLs[urls[i * 2].AsString()] = urls[(i * 2) + 1].AsString();
+                    tmpOSD = urls[i];
+                    tmpOSDb = urls[i + 1];
+                    ServiceURLs[tmpOSD.AsString()] = tmpOSDb.AsString();
                    //System.Console.WriteLine("XXX " + urls[i * 2].AsString() + "=" + urls[(i * 2) + 1].AsString());
                }
            }
        }
    }
 }
diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index b6e48b4..2cd11ff 100644
--- a/OpenSim/Framework/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.cs
@@ -79,6 +79,7 @@ namespace OpenSim.Framework
                user.LoginInfo.InventoryFolder = validcircuit.InventoryFolder;
                user.LoginInfo.BaseFolder = validcircuit.BaseFolder;
                user.LoginInfo.StartPos = validcircuit.startpos;
+                user.LoginInfo.StartFar = (float)validcircuit.startfar;
            }
            else
            {
@@ -175,7 +176,8 @@ namespace OpenSim.Framework
                {
                    m_agentCircuits[(uint) agentData.circuitcode].firstname = agentData.firstname;
                    m_agentCircuits[(uint) agentData.circuitcode].lastname = agentData.lastname;
-                    m_agentCircuits[(uint) agentData.circuitcode].startpos = agentData.startpos;
+                    m_agentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;
+                    m_agentCircuits[(uint)agentData.circuitcode].startfar = agentData.startfar;
                    // Updated for when we don't know them before calling Scene.NewUserConnection
                    m_agentCircuits[(uint) agentData.circuitcode].SecureSessionID = agentData.SecureSessionID;
diff --git a/OpenSim/Framework/AgentUpdateArgs.cs b/OpenSim/Framework/AgentUpdateArgs.cs
index f04d692..cd1c3a0 100644
--- a/OpenSim/Framework/AgentUpdateArgs.cs
+++ b/OpenSim/Framework/AgentUpdateArgs.cs
@@ -83,6 +83,7 @@ namespace OpenSim.Framework
        public bool UseClientAgentPosition;
        public bool NeedsCameraCollision;
        public uint lastpacketSequence;
+        public double lastUpdateTS;
        public AgentUpdateArgs()
        {
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
index 097ad7d..efccc35 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
@@ -42,11 +42,13 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
    public class AssetLoaderFileSystem : IAssetLoader
    {
        private static readonly UUID LIBRARY_OWNER_ID = new UUID("11111111-1111-0000-0000-000100bba000");
+        private static readonly string LIBRARY_OWNER_IDstr = "11111111-1111-0000-0000-000100bba000";
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        protected static AssetBase CreateAsset(string assetIdStr, string name, string path, sbyte type)
        {
-            AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_ID.ToString());
+            AssetBase asset = new AssetBase(new UUID(assetIdStr), name, type, LIBRARY_OWNER_IDstr);
            if (!String.IsNullOrEmpty(path))
            {
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 77a7621..3973d36 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -51,27 +51,28 @@ namespace OpenSim.Framework
        // this is viewer capabilities and weared things dependent
        // should be only used as initial default value ( V1 viewers )
-        public readonly static int VISUALPARAM_COUNT = 218;
+        public const int VISUALPARAM_COUNT = 218;
-//        public readonly static int TEXTURE_COUNT = 21
+        // regions and viewer compatibility
-        // 21 bad, make it be updated as libovm gets update
+        public readonly static int TEXTURE_COUNT = 45;
-        // also keeping in sync with it
+        public const int TEXTURE_COUNT_PV7 = 29;
-        public readonly static int TEXTURE_COUNT = Primitive.TextureEntry.MAX_FACES;
+        public const int BAKES_COUNT_PV7 = 6;
+        public const int MAXWEARABLE_PV7 = 16;
+        public const int MAXWEARABLE_LEGACY = 15;
-        public readonly static byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 };
+        public readonly static byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20, 40, 41, 42, 43, 44 };
        protected int m_serial = 0;
        protected byte[] m_visualparams;
        protected Primitive.TextureEntry m_texture;
        protected AvatarWearable[] m_wearables;
        protected Dictionary<int, List<AvatarAttachment>> m_attachments;
-        protected float m_avatarHeight = 0;
+        protected WearableCacheItem[] m_cacheitems;
        protected Vector3 m_avatarSize = new Vector3(0.45f, 0.6f, 1.9f); // sl Z cloud value
        protected Vector3 m_avatarBoxSize = new Vector3(0.45f, 0.6f, 1.9f);
+        protected float m_avatarHeight = 0;
        protected float m_avatarFeetOffset = 0;
        protected float m_avatarAnimOffset = 0;
-        protected WearableCacheItem[] m_cacheitems;
-        protected bool m_cacheItemsDirty = true;
        public virtual int Serial
        {
@@ -128,11 +129,7 @@ namespace OpenSim.Framework
            set { m_cacheitems = value; }
        }
-        public virtual bool WearableCacheItemsDirty
+        public virtual float AvatarPreferencesHoverZ { get; set; }
-        {
-            get { return m_cacheItemsDirty; }
-            set { m_cacheItemsDirty = value; }
-        }
        public AvatarAppearance()
        {
@@ -204,12 +201,14 @@ namespace OpenSim.Framework
                SetDefaultParams();
 //                SetHeight();
                SetSize(new Vector3(0.45f, 0.6f, 1.9f));
+                AvatarPreferencesHoverZ = 0;
                m_attachments = new Dictionary<int, List<AvatarAttachment>>();
                return;
            }
            m_serial = appearance.Serial;
+            AvatarPreferencesHoverZ = appearance.AvatarPreferencesHoverZ;
            if (copyWearables && (appearance.Wearables != null))
            {
@@ -228,7 +227,7 @@ namespace OpenSim.Framework
            m_texture = null;
            if (appearance.Texture != null)
            {
-                byte[] tbytes = appearance.Texture.GetBytes();
+                byte[] tbytes = appearance.Texture.GetBakesBytes();
                m_texture = new Primitive.TextureEntry(tbytes,0,tbytes.Length);
                if (copyBaked && appearance.m_cacheitems != null)
                    m_cacheitems = (WearableCacheItem[])appearance.m_cacheitems.Clone();
@@ -295,6 +294,7 @@ namespace OpenSim.Framework
            m_serial = 0;
            SetDefaultTexture();
+            AvatarPreferencesHoverZ = 0;
            //for (int i = 0; i < BAKE_INDICES.Length; i++)
            // {
@@ -330,9 +330,6 @@ namespace OpenSim.Framework
        protected virtual void SetDefaultTexture()
        {
            m_texture = new Primitive.TextureEntry(new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE));
-            // for (uint i = 0; i < TEXTURE_COUNT; i++)
-            //     m_texture.CreateFace(i).TextureID = new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE);
        }
        /// <summary>
@@ -347,31 +344,31 @@ namespace OpenSim.Framework
            if (textureEntry == null)
                return false;
-            // There are much simpler versions of this copy that could be
-            // made. We determine if any of the textures actually
-            // changed to know if the appearance should be saved later
            bool changed = false;
-            for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
+            Primitive.TextureEntryFace newface;
-            {
+            Primitive.TextureEntryFace tmpFace;
-                Primitive.TextureEntryFace newface = textureEntry.FaceTextures[i];
-                Primitive.TextureEntryFace oldface = m_texture.FaceTextures[i];
-                if (newface == null)
+            //make sure textureEntry.DefaultTexture is the unused one(DEFAULT_AVATAR_TEXTURE).
+            Primitive.TextureEntry converted = new Primitive.TextureEntry(AppearanceManager.DEFAULT_AVATAR_TEXTURE);
+            for (uint i = 0; i < TEXTURE_COUNT; ++i)
+            {
+                newface = textureEntry.GetFace(i);
+                if (newface.TextureID != AppearanceManager.DEFAULT_AVATAR_TEXTURE)
                {
-                    if (oldface == null)
+                    tmpFace = converted.GetFace(i);
-                        continue;
+                    tmpFace.TextureID = newface.TextureID; // we need a full high level copy, assuming all other parameters are the same.
+                    if (m_texture.FaceTextures[i] == null || newface.TextureID != m_texture.FaceTextures[i].TextureID)
+                        changed = true;
                }
                else
-                {
+                {   if (m_texture.FaceTextures[i] == null)
-                    if (oldface != null && oldface.TextureID == newface.TextureID)
                        continue;
+                    if(m_texture.FaceTextures[i].TextureID != AppearanceManager.DEFAULT_AVATAR_TEXTURE)
+                        changed = true;
                }
-                changed = true;
            }
+            if(changed)
-            m_texture = textureEntry;
+                m_texture = converted;
            return changed;
        }
@@ -736,42 +733,130 @@ namespace OpenSim.Framework
            data["serial"] = OSD.FromInteger(m_serial);
            data["height"] = OSD.FromReal(m_avatarHeight);
+            data["aphz"] = OSD.FromReal(AvatarPreferencesHoverZ);
+            if (m_texture == null)
+                return data;
+            bool sendPV8 = false;
            // Wearables
-            //
+            OSDArray wears;
-            // This will send as many or as few wearables as we have, unless a count
+            int count;
-            // is given. Used for legacy (pre 0.4) versions.
+            if (ctx == null)
-            int count = ctx.WearablesCount;
+                count = MAXWEARABLE_LEGACY;
-            if (ctx.WearablesCount == -1)
+            else
-                count = m_wearables.Length;
-            OSDArray wears = new OSDArray(count);
-            for (int i = 0; i < count; i++)
            {
-                AvatarWearable dummyWearable = new AvatarWearable();
+                if(ctx.OutboundVersion >= 0.8)
+                {
-                if (i < m_wearables.Length)
+                    sendPV8 = true;
-                    wears.Add(m_wearables[i].Pack());
+                    count = m_wearables.Length;
+                }
+                else if (ctx.OutboundVersion >= 0.6)
+                    count = MAXWEARABLE_PV7;
                else
-                    wears.Add(dummyWearable.Pack());
+                    count = MAXWEARABLE_LEGACY;
+                if (sendPV8 && count > MAXWEARABLE_PV7)
+                {
+                    wears = new OSDArray(count - MAXWEARABLE_PV7);
+                    for (int i = MAXWEARABLE_PV7; i < count; ++i)
+                        wears.Add(m_wearables[i].Pack());
+                    data["wrbls8"] = wears;
+                    count = MAXWEARABLE_PV7;
+                }
            }
+            if(count > m_wearables.Length)
+                count = m_wearables.Length;
+            wears = new OSDArray(count);
+            for (int i = 0; i < count; ++i)
+                wears.Add(m_wearables[i].Pack());
            data["wearables"] = wears;
            // Avatar Textures
-            OSDArray textures = new OSDArray(AvatarAppearance.TEXTURE_COUNT);
+            OSDArray textures;
-            for (uint i = 0; i < AvatarAppearance.TEXTURE_COUNT; i++)
+            if (sendPV8)
            {
-                if (m_texture.FaceTextures[i] != null)
+                byte[] te = m_texture.GetBakesBytes();
-                    textures.Add(OSD.FromUUID(m_texture.FaceTextures[i].TextureID));
+                data["te8"] = OSD.FromBinary(te);
-                else
+            }
-                    textures.Add(OSD.FromUUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE));
+            else
+            {
+                textures = new OSDArray(TEXTURE_COUNT_PV7);
+                for (uint i = 0; i < TEXTURE_COUNT_PV7; ++i)
+                    textures.Add(OSD.FromUUID(m_texture.GetFace(i).TextureID));
+                data["textures"] = textures;
            }
-            data["textures"] = textures;
            if (m_cacheitems != null)
            {
-                OSDArray baked = WearableCacheItem.BakedToOSD(m_cacheitems);
+                OSDArray baked = WearableCacheItem.BakedToOSD(m_cacheitems, 0, BAKES_COUNT_PV7);
-                if (baked != null)
+                if (baked != null && baked.Count > 0)
                    data["bakedcache"] = baked;
+                baked = WearableCacheItem.BakedToOSD(m_cacheitems, BAKES_COUNT_PV7, -1);
+                if (baked != null && baked.Count > 0)
+                    data["bc8"] = baked;
+            }
+            // Visual Parameters
+            OSDBinary visualparams = new OSDBinary(m_visualparams);
+            data["visualparams"] = visualparams;
+            lock (m_attachments)
+            {
+                // Attachments
+                OSDArray attachs = new OSDArray(m_attachments.Count);
+                foreach (AvatarAttachment attach in GetAttachments())
+                    attachs.Add(attach.Pack());
+                data["attachments"] = attachs;
+            }
+            return data;
+        }
+        public OSDMap PackForNotecard()
+        {
+            OSDMap data = new OSDMap();
+            data["serial"] = OSD.FromInteger(m_serial);
+            data["height"] = OSD.FromReal(m_avatarHeight);
+            data["aphz"] = OSD.FromReal(AvatarPreferencesHoverZ);
+            // old regions may not like missing/empty wears
+            OSDArray wears = new OSDArray(MAXWEARABLE_LEGACY);
+            for (int i = 0; i< MAXWEARABLE_LEGACY; ++i)
+                wears.Add(new OSDArray());
+            data["wearables"] = wears;
+            // Avatar Textures
+            OSDArray textures;
+            // allow old regions to still see something
+            textures = new OSDArray(TEXTURE_COUNT_PV7);
+            textures.Add(OSD.FromUUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE));
+            for (uint i = 1; i < TEXTURE_COUNT_PV7; ++i)
+                textures.Add(OSD.FromUUID(m_texture.GetFace(i).TextureID));
+            data["textures"] = textures;
+            bool needExtra = false;
+            for (int i = BAKES_COUNT_PV7; i < BAKE_INDICES.Length; ++i)
+            {
+                int idx = BAKE_INDICES[i];
+                if (m_texture.FaceTextures[idx] == null)
+                    continue;
+                if (m_texture.FaceTextures[idx].TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE ||
+                        m_texture.FaceTextures[idx].TextureID == UUID.Zero)
+                    continue;
+                needExtra = true;
+            }
+            if (needExtra)
+            {
+                byte[] te = m_texture.GetBakesBytes();
+                data["te8"] = OSD.FromBinary(te);
            }
            // Visual Parameters
@@ -796,62 +881,108 @@ namespace OpenSim.Framework
        /// </summary>
        public void Unpack(OSDMap data)
        {
-            if ((data != null) && (data["serial"] != null))
+            SetDefaultWearables();
-                m_serial = data["serial"].AsInteger();
+            SetDefaultTexture();
-            if ((data != null) && (data["height"] != null))
+            SetDefaultParams();
-//                m_avatarHeight = (float)data["height"].AsReal();
+            m_attachments = new Dictionary<int, List<AvatarAttachment>>();
-                SetSize(new Vector3(0.45f,0.6f, (float)data["height"].AsReal()));
-            try
+            if(data == null)
            {
-                // Wearables
+                m_log.Warn("[AVATAR APPEARANCE]: data to unpack is null");
-                SetDefaultWearables();
+                return;
-                if ((data != null) && (data["wearables"] != null) && (data["wearables"]).Type == OSDType.Array)
+            }
-                {
-                    OSDArray wears = (OSDArray)(data["wearables"]);
-                    int count = wears.Count;
+            OSD tmpOSD;
+            if (data.TryGetValue("serial", out tmpOSD))
+                m_serial = tmpOSD.AsInteger();
+            if(data.TryGetValue("aphz", out tmpOSD))
+                AvatarPreferencesHoverZ = (float)tmpOSD.AsReal();
+            if (data.TryGetValue("height", out tmpOSD))
+                SetSize(new Vector3(0.45f, 0.6f, (float)tmpOSD.AsReal()));
-                    m_wearables = new AvatarWearable[count];
+            try
+            {
+                // Wearables
+                OSD tmpOSD8;
+                OSDArray wears8 = null;
+                int wears8Count = 0;
-                    for (int i = 0; i < count; i++)
+                if (data.TryGetValue("wrbls8", out tmpOSD8) && (tmpOSD8 is OSDArray))
-                        m_wearables[i] = new AvatarWearable((OSDArray)wears[i]);
-                }
-                else
                {
-                    m_log.Warn("[AVATAR APPEARANCE]: failed to unpack wearables");
+                    wears8 = (OSDArray)tmpOSD8;
+                    wears8Count = wears8.Count;
                }
-                // Avatar Textures
+                if (data.TryGetValue("wearables", out tmpOSD) && (tmpOSD is OSDArray))
-                SetDefaultTexture();
-                if ((data != null) && (data["textures"] != null) && (data["textures"]).Type == OSDType.Array)
                {
-                    OSDArray textures = (OSDArray)(data["textures"]);
+                    OSDArray wears = (OSDArray)tmpOSD;
-                    for (int i = 0; i < AvatarAppearance.TEXTURE_COUNT && i < textures.Count; i++)
+                    if(wears.Count + wears8Count > 0)
                    {
-                        UUID textureID = AppearanceManager.DEFAULT_AVATAR_TEXTURE;
+                        m_wearables = new AvatarWearable[wears.Count + wears8Count];
-                        if (textures[i] != null)
-                            textureID = textures[i].AsUUID();
+                        for (int i = 0; i < wears.Count; ++i)
-                        m_texture.CreateFace((uint)i).TextureID = new UUID(textureID);
+                            m_wearables[i] = new AvatarWearable((OSDArray)wears[i]);
+                        if (wears8Count > 0)
+                        {
+                            for (int i = 0; i < wears8Count; ++i)
+                                m_wearables[i + wears.Count] = new AvatarWearable((OSDArray)wears8[i]);
+                        }
                    }
                }
-                else
+                if (data.TryGetValue("te8", out tmpOSD))
                {
-                    m_log.Warn("[AVATAR APPEARANCE]: failed to unpack textures");
+                    byte[] teb = tmpOSD.AsBinary();
+                    Primitive.TextureEntry te = new Primitive.TextureEntry(teb, 0, teb.Length);
+                    m_texture = te;
+                }
+                else if (data.TryGetValue("textures", out tmpOSD) && (tmpOSD is OSDArray))
+                {
+                    OSDArray textures = (OSDArray)tmpOSD;
+                    for (int i = 0; i < textures.Count && i < TEXTURE_COUNT_PV7; ++i)
+                    {
+                        tmpOSD = textures[i];
+                        if (tmpOSD != null)
+                            m_texture.CreateFace((uint)i).TextureID = tmpOSD.AsUUID();
+                    }
                }
-                if ((data != null) && (data["bakedcache"] != null) && (data["bakedcache"]).Type == OSDType.Array)
+                if (data.TryGetValue("bakedcache", out tmpOSD) && (tmpOSD is OSDArray))
                {
-                    OSDArray bakedOSDArray = (OSDArray)(data["bakedcache"]);
+                    OSDArray bakedOSDArray = (OSDArray)tmpOSD;
-                    m_cacheitems = WearableCacheItem.BakedFromOSD(bakedOSDArray);
+                    m_cacheitems = WearableCacheItem.GetDefaultCacheItem();
+                    bakedOSDArray = (OSDArray)tmpOSD;
+                    foreach (OSDMap item in bakedOSDArray)
+                    {
+                        int idx = item["textureindex"].AsInteger();
+                        if (idx < 0 || idx >= m_cacheitems.Length)
+                            continue;
+                        m_cacheitems[idx].CacheId = item["cacheid"].AsUUID();
+                        m_cacheitems[idx].TextureID = item["textureid"].AsUUID();
+                        m_cacheitems[idx].TextureAsset = null;
+                    }
+                    if (data.TryGetValue("bc8", out tmpOSD) && (tmpOSD is OSDArray))
+                    {
+                        bakedOSDArray = (OSDArray)tmpOSD;
+                        foreach (OSDMap item in bakedOSDArray)
+                        {
+                            int idx = item["textureindex"].AsInteger();
+                            if (idx < 0 || idx >= m_cacheitems.Length)
+                                continue;
+                            m_cacheitems[idx].CacheId = item["cacheid"].AsUUID();
+                            m_cacheitems[idx].TextureID = item["textureid"].AsUUID();
+                            m_cacheitems[idx].TextureAsset = null;
+                        }
+                    }
                }
                // Visual Parameters
-                SetDefaultParams();
+                if (data.TryGetValue("visualparams", out tmpOSD))
-                if ((data != null) && (data["visualparams"] != null))
                {
-                    if ((data["visualparams"].Type == OSDType.Binary) || (data["visualparams"].Type == OSDType.Array))
+                    if (tmpOSD is OSDBinary || tmpOSD is OSDArray)
-                        m_visualparams = data["visualparams"].AsBinary();
+                        m_visualparams = tmpOSD.AsBinary();
                }
                else
                {
@@ -859,10 +990,9 @@ namespace OpenSim.Framework
                }
                // Attachments
-                m_attachments = new Dictionary<int, List<AvatarAttachment>>();
+                if (data.TryGetValue("attachments", out tmpOSD) && tmpOSD is OSDArray)
-                if ((data != null) && (data["attachments"] != null) && (data["attachments"]).Type == OSDType.Array)
                {
-                    OSDArray attachs = (OSDArray)(data["attachments"]);
+                    OSDArray attachs = (OSDArray)tmpOSD;
                    for (int i = 0; i < attachs.Count; i++)
                    {
                        AvatarAttachment att = new AvatarAttachment((OSDMap)attachs[i]);
@@ -882,6 +1012,32 @@ namespace OpenSim.Framework
        #endregion
+        public bool CanTeleport(float version)
+        {
+            if (version >= 0.8)
+                return true;
+            if (m_wearables.Length <= MAXWEARABLE_PV7)
+                return true;
+            for(int i = MAXWEARABLE_PV7; i < m_wearables.Length; ++i)
+            {
+                if(m_wearables[i].Count > 0)
+                    return false;
+            }
+            // also check baked
+            for (int i = BAKES_COUNT_PV7; i < BAKE_INDICES.Length; i++)
+            {
+                int idx = BAKE_INDICES[i];
+                if (m_texture.FaceTextures[idx] == null)
+                    continue;
+                if (m_texture.FaceTextures[idx].TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE ||
+                        m_texture.FaceTextures[idx].TextureID == UUID.Zero)
+                    continue;
+                return false;
+            }
+            return true;
+        }
        #region VPElement
        /// <summary>
diff --git a/OpenSim/Framework/AvatarAttachment.cs b/OpenSim/Framework/AvatarAttachment.cs
index 07dd385..d8a0ffc 100644
--- a/OpenSim/Framework/AvatarAttachment.cs
+++ b/OpenSim/Framework/AvatarAttachment.cs
@@ -68,11 +68,18 @@ namespace OpenSim.Framework
        public void Unpack(OSDMap args)
        {
-            if (args["point"] != null)
+            OSD tmpOSD;
-                AttachPoint = args["point"].AsInteger();
+            if (args.TryGetValue("point", out tmpOSD))
+                AttachPoint = tmpOSD.AsInteger();
+            if (args.TryGetValue("item", out tmpOSD))
+                ItemID = tmpOSD.AsUUID();
+            else
+                ItemID = UUID.Zero;
-            ItemID = (args["item"] != null) ? args["item"].AsUUID() : UUID.Zero;
+            if (args.TryGetValue("asset", out tmpOSD))
-            AssetID = (args["asset"] != null) ? args["asset"].AsUUID() : UUID.Zero;
+                AssetID = tmpOSD.AsUUID();
+            else
+                AssetID = UUID.Zero;
        }
    }
 }
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index 0e8f960..1733559 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -67,10 +67,14 @@ namespace OpenSim.Framework
        public static readonly int ALPHA = 13;
        public static readonly int TATTOO = 14;
        public static readonly int LEGACY_VERSION_MAX_WEARABLES = 15;
-//        public static readonly int PHYSICS = 15;
-//        public static int MAX_WEARABLES = 16;
+        public static readonly int PHYSICS = 15;
+        public static int MAX_WEARABLES_PV7 = 16;
+        public static readonly int UNIVERSAL = 16;
+        public static int MAX_WEARABLES = 17;
        public static readonly UUID DEFAULT_BODY_ITEM = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
@@ -91,11 +95,11 @@ namespace OpenSim.Framework
        public static readonly UUID DEFAULT_PANTS_ITEM = new UUID("77c41e39-38f9-f75a-0000-5859892f1111");
        public static readonly UUID DEFAULT_PANTS_ASSET = new UUID("00000000-38f9-1111-024e-222222111120");
-//        public static readonly UUID DEFAULT_ALPHA_ITEM = new UUID("bfb9923c-4838-4d2d-bf07-608c5b1165c8");
+        public static readonly UUID DEFAULT_ALPHA_ITEM = new UUID("bfb9923c-4838-4d2d-bf07-608c5b1165c8");
-//        public static readonly UUID DEFAULT_ALPHA_ASSET = new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594");
+        public static readonly UUID DEFAULT_ALPHA_ASSET = new UUID("1578a2b1-5179-4b53-b618-fe00ca5a5594");
-//        public static readonly UUID DEFAULT_TATTOO_ITEM = new UUID("c47e22bd-3021-4ba4-82aa-2b5cb34d35e1");
+        public static readonly UUID DEFAULT_TATTOO_ITEM = new UUID("c47e22bd-3021-4ba4-82aa-2b5cb34d35e1");
-//        public static readonly UUID DEFAULT_TATTOO_ASSET = new UUID("00000000-0000-2222-3333-100000001007");
+        public static readonly UUID DEFAULT_TATTOO_ASSET = new UUID("00000000-0000-2222-3333-100000001007");
        protected Dictionary<UUID, UUID> m_items = new Dictionary<UUID, UUID>();
        protected List<UUID> m_ids = new List<UUID>();
@@ -132,10 +136,12 @@ namespace OpenSim.Framework
        public void Unpack(OSDArray args)
        {
            Clear();
+            OSD tmpOSDA, tmpOSDB;
            foreach (OSDMap weardata in args)
            {
-                Add(weardata["item"].AsUUID(), weardata["asset"].AsUUID());
+                tmpOSDA = weardata["item"];
+                tmpOSDB = weardata["asset"];
+                Add(tmpOSDA.AsUUID(), tmpOSDB.AsUUID());
            }
        }
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
deleted file mode 100644
index 2461049..0000000
--- a/OpenSim/Framework/BlockingQueue.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * 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
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using System.Collections.Generic;
-using System.Threading;
-namespace OpenSim.Framework
-{
-    public class BlockingQueue<T>
-    {
-        private readonly Queue<T> m_pqueue = new Queue<T>();
-        private readonly Queue<T> m_queue = new Queue<T>();
-        private readonly object m_queueSync = new object();
-        public void PriorityEnqueue(T value)
-        {
-            lock (m_queueSync)
-            {
-                m_pqueue.Enqueue(value);
-                Monitor.Pulse(m_queueSync);
-            }
-        }
-        public void Enqueue(T value)
-        {
-            lock (m_queueSync)
-            {
-                m_queue.Enqueue(value);
-                Monitor.Pulse(m_queueSync);
-            }
-        }
-        public T Dequeue()
-        {
-            lock (m_queueSync)
-            {
-                while (m_queue.Count < 1 && m_pqueue.Count < 1)
-                {
-                    Monitor.Wait(m_queueSync);
-                }
-                if (m_pqueue.Count > 0)
-                    return m_pqueue.Dequeue();
-                if (m_queue.Count > 0)
-                    return m_queue.Dequeue();
-                return default(T);
-            }
-        }
-        public T Dequeue(int msTimeout)
-        {
-            lock (m_queueSync)
-            {
-                if (m_queue.Count < 1 && m_pqueue.Count < 1)
-                {
-                    if(!Monitor.Wait(m_queueSync, msTimeout))
-                        return default(T);
-                }
-                if (m_pqueue.Count > 0)
-                    return m_pqueue.Dequeue();
-                if (m_queue.Count > 0)
-                    return m_queue.Dequeue();
-                return default(T);
-            }
-        }
-        /// <summary>
-        /// Indicate whether this queue contains the given item.
-        /// </summary>
-        /// <remarks>
-        /// This method is not thread-safe.  Do not rely on the result without consistent external locking.
-        /// </remarks>
-        public bool Contains(T item)
-        {
-            lock (m_queueSync)
-            {
-                if (m_queue.Count < 1 && m_pqueue.Count < 1)
-                    return false;
-                if (m_pqueue.Contains(item))
-                    return true;
-                return m_queue.Contains(item);
-            }
-        }
-        /// <summary>
-        /// Return a count of the number of requests on this queue.
-        /// </summary>
-        public int Count()
-        {
-            lock (m_queueSync)
-                return m_queue.Count + m_pqueue.Count;
-        }
-        /// <summary>
-        /// Return the array of items on this queue.
-        /// </summary>
-        /// <remarks>
-        /// This method is not thread-safe.  Do not rely on the result without consistent external locking.
-        /// </remarks>
-        public T[] GetQueueArray()
-        {
-            lock (m_queueSync)
-            {
-                if (m_queue.Count < 1 && m_pqueue.Count < 1)
-                    return new T[0];
-                return m_queue.ToArray();
-            }
-        }
-        public void Clear()
-        {
-            lock (m_queueSync)
-            {
-                m_pqueue.Clear();
-                m_queue.Clear();
-                Monitor.Pulse(m_queueSync);
-            }
-        }
-    }
-}
diff --git a/OpenSim/Framework/ChatTypeEnum.cs b/OpenSim/Framework/ChatTypeEnum.cs
index b7e4e7c..f281f5c 100644
--- a/OpenSim/Framework/ChatTypeEnum.cs
+++ b/OpenSim/Framework/ChatTypeEnum.cs
@@ -38,6 +38,7 @@ namespace OpenSim.Framework
        DebugChannel = 6,
        Region = 7,
        Owner = 8,
+        Direct = 9, //llRegionSayTo
        Broadcast = 0xFF
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index ee5007a..2d00296 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -398,7 +398,8 @@ namespace OpenSim.Framework
        // Scripted
        public ControllerData[] Controllers;
-        public string CallbackURI;
+        public string CallbackURI; // to remove
+        public string NewCallbackURI;
        // These two must have the same Count
        public List<ISceneObject> AttachmentObjects;
@@ -528,6 +529,9 @@ namespace OpenSim.Framework
            if ((CallbackURI != null) && (!CallbackURI.Equals("")))
                args["callback_uri"] = OSD.FromString(CallbackURI);
+            if ((NewCallbackURI != null) && (!NewCallbackURI.Equals("")))
+                args["cb_uri"] = OSD.FromString(NewCallbackURI);
            // Attachment objects for fatpack messages
            if (AttachmentObjects != null)
            {
@@ -811,12 +815,7 @@ namespace OpenSim.Framework
                }
                // end of code to remove
            }
-/* moved above
-            if (args.ContainsKey("packed_appearance") && (args["packed_appearance"]).Type == OSDType.Map)
-                Appearance = new AvatarAppearance((OSDMap)args["packed_appearance"]);
-            else
-                m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance");
-*/
            if ((args["controllers"] != null) && (args["controllers"]).Type == OSDType.Array)
            {
                OSDArray controls = (OSDArray)(args["controllers"]);
@@ -834,6 +833,9 @@ namespace OpenSim.Framework
            if (args["callback_uri"] != null)
                CallbackURI = args["callback_uri"].AsString();
+            if (args["cb_uri"] != null)
+                NewCallbackURI = args["cb_uri"].AsString();
            // Attachment objects
            if (args["attach_objects"] != null && args["attach_objects"].Type == OSDType.Array)
            {
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 45c54e4..1508c7f 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -51,7 +51,14 @@ namespace OpenSim.Framework
        private object m_syncRoot = new object();
        /// <summary>Number of clients in the collection</summary>
-        public int Count { get { return m_dict1.Count; } }
+        public int Count
+        {
+            get
+            {
+                lock (m_syncRoot) 
+                    return m_dict1.Count;
+            }
+        }
        /// <summary>
        /// Default constructor
@@ -60,7 +67,7 @@ namespace OpenSim.Framework
        {
            m_dict1 = new Dictionary<UUID, IClientAPI>();
            m_dict2 = new Dictionary<IPEndPoint, IClientAPI>();
-            m_array = new IClientAPI[0];
+            m_array = null;
        }
        /// <summary>
@@ -74,17 +81,9 @@ namespace OpenSim.Framework
        {
            lock (m_syncRoot)
            {
-                // allow self healing
-//                if (m_dict1.ContainsKey(value.AgentId) || m_dict2.ContainsKey(value.RemoteEndPoint))
-//                    return false;
                m_dict1[value.AgentId] = value;
                m_dict2[value.RemoteEndPoint] = value;
+                m_array = null;
-                // dict1 is the master
-                IClientAPI[] newArray = new IClientAPI[m_dict1.Count];
-                m_dict1.Values.CopyTo(newArray, 0);
-                m_array = newArray;
            }
            return true;
@@ -105,10 +104,7 @@ namespace OpenSim.Framework
                {
                    m_dict1.Remove(key);
                    m_dict2.Remove(value.RemoteEndPoint);
+                    m_array = null;
-                    IClientAPI[] newArray = new IClientAPI[m_dict1.Count];
-                    m_dict1.Values.CopyTo(newArray, 0);
-                    m_array = newArray;
                    return true;
                }
            }
@@ -124,7 +120,7 @@ namespace OpenSim.Framework
            {
                m_dict1.Clear();
                m_dict2.Clear();
-                m_array = new IClientAPI[0];
+                m_array = null;
            }
        }
@@ -135,7 +131,8 @@ namespace OpenSim.Framework
        /// <returns>True if the UUID was found in the collection, otherwise false</returns>
        public bool ContainsKey(UUID key)
        {
-            return m_dict1.ContainsKey(key);
+            lock (m_syncRoot)
+                return m_dict1.ContainsKey(key);
        }
        /// <summary>
@@ -145,7 +142,8 @@ namespace OpenSim.Framework
        /// <returns>True if the endpoint was found in the collection, otherwise false</returns>
        public bool ContainsKey(IPEndPoint key)
        {
-            return m_dict2.ContainsKey(key);
+            lock (m_syncRoot)
+                return m_dict2.ContainsKey(key);
        }
        /// <summary>
@@ -156,8 +154,12 @@ namespace OpenSim.Framework
        /// <returns>True if the lookup succeeded, otherwise false</returns>
        public bool TryGetValue(UUID key, out IClientAPI value)
        {
-            try { return m_dict1.TryGetValue(key, out value); }
+            try
-            catch (Exception)
+            {
+                lock (m_syncRoot)
+                    return m_dict1.TryGetValue(key, out value);
+            }
+            catch
            {
                value = null;
                return false;
@@ -172,8 +174,12 @@ namespace OpenSim.Framework
        /// <returns>True if the lookup succeeded, otherwise false</returns>
        public bool TryGetValue(IPEndPoint key, out IClientAPI value)
        {
-            try { return m_dict2.TryGetValue(key, out value); }
+            try
-            catch (Exception)
+            {
+                lock (m_syncRoot)
+                    return m_dict2.TryGetValue(key, out value);
+            }
+            catch
            {
                value = null;
                return false;
@@ -187,7 +193,20 @@ namespace OpenSim.Framework
        /// <param name="action">Action to perform on each element</param>
        public void ForEach(Action<IClientAPI> action)
        {
-            IClientAPI[] localArray = m_array;
+            IClientAPI[] localArray;
+            lock (m_syncRoot)
+            {
+                if (m_array == null)
+                {
+                    if (m_dict1.Count == 0)
+                        return;
+                    m_array = new IClientAPI[m_dict1.Count];
+                    m_dict1.Values.CopyTo(m_array, 0);
+                }
+                localArray = m_array;
+            }
            for (int i = 0; i < localArray.Length; i++)
                action(localArray[i]);
        }
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index 7afa68a..32c6a3e 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -262,14 +262,14 @@ namespace OpenSim.Framework
                                if (configurationDescription.Trim() != String.Empty)
                                {
                                    console_result =
-                                        MainConsole.Instance.CmdPrompt(
+                                        MainConsole.Instance.Prompt(
                                            configurationDescription + ": " + configOption.configurationQuestion,
                                            configOption.configurationDefault);
                                }
                                else
                                {
                                    console_result =
-                                        MainConsole.Instance.CmdPrompt(configOption.configurationQuestion,
+                                        MainConsole.Instance.Prompt(configOption.configurationQuestion,
                                                                       configOption.configurationDefault);
                                }
                            }
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 52360b4..d2b6618 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -36,6 +36,7 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using log4net;
 using OpenSim.Framework;
+using Nini.Config;
 namespace OpenSim.Framework.Console
 {
@@ -789,5 +790,9 @@ namespace OpenSim.Framework.Console
            }
            return cmdinput;
        }
+        public virtual void ReadConfig(IConfigSource configSource)
+        {
+        }
    }
 }
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 64cddea..8748b25 100644
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -35,13 +35,39 @@ using log4net;
 namespace OpenSim.Framework.Console
 {
-    public class ConsoleBase
+    public class ConsoleLevel
+    {
+        public string m_string;
+        ConsoleLevel(string v)
+        {
+            m_string = v;
+        }
+        static public implicit operator ConsoleLevel(string s)
+        {
+            return new ConsoleLevel(s);
+        }
+        public static string ToString(ConsoleLevel s)
+        {
+            return s.m_string;
+        }
+        public override string ToString()
+        {
+            return m_string;
+        }
+    }
+    public class ConsoleBase : IConsole
    {
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        protected string prompt = "# ";
-        public object ConsoleScene { get; set; }
+        public IScene ConsoleScene { get; set; }
        public string DefaultPrompt { get; set; }
@@ -58,27 +84,47 @@ namespace OpenSim.Framework.Console
        {
        }
-        public virtual void Output(string text, string level)
+        public void Output(string format)
        {
-            Output(text);
+            System.Console.WriteLine(format);
        }
-        public virtual void Output(string text)
+        public virtual void Output(string format, params object[] components)
        {
-            System.Console.WriteLine(text);
+            string level = null;
-        }
+            if (components != null && components.Length > 0)
+            {
+                if (components[0] == null || components[0] is ConsoleLevel)
+                {
+                    if (components[0] is ConsoleLevel)
+                        level = ((ConsoleLevel)components[0]).ToString();
-        public virtual void OutputFormat(string format, params object[] components)
+                    if (components.Length > 1)
-        {
+                    {
-            Output(string.Format(format, components));
+                        object[] tmp = new object[components.Length - 1];
+                        Array.Copy(components, 1, tmp, 0, components.Length - 1);
+                        components = tmp;
+                    }
+                    else
+                        components = null;
+                }
+            }
+            string text;
+            if (components == null || components.Length == 0)
+                text = format;
+            else
+                text = String.Format(format, components);
+            System.Console.WriteLine(text);
        }
-        public string CmdPrompt(string p)
+        public string Prompt(string p)
        {
            return ReadLine(String.Format("{0}: ", p), false, true);
        }
-        public string CmdPrompt(string p, string def)
+        public string Prompt(string p, string def)
        {
            string ret = ReadLine(String.Format("{0} [{1}]: ", p, def), false, true);
            if (ret == String.Empty)
@@ -87,14 +133,14 @@ namespace OpenSim.Framework.Console
            return ret;
        }
-        public string CmdPrompt(string p, List<char> excludedCharacters)
+        public string Prompt(string p, List<char> excludedCharacters)
        {
            bool itisdone = false;
            string ret = String.Empty;
            while (!itisdone)
            {
                itisdone = true;
-                ret = CmdPrompt(p);
+                ret = Prompt(p);
                foreach (char c in excludedCharacters)
                {
@@ -109,27 +155,34 @@ namespace OpenSim.Framework.Console
            return ret;
        }
-        public string CmdPrompt(string p, string def, List<char> excludedCharacters)
+        public virtual string Prompt(string p, string def, List<char> excludedCharacters, bool echo = true)
        {
            bool itisdone = false;
            string ret = String.Empty;
            while (!itisdone)
            {
                itisdone = true;
-                ret = CmdPrompt(p, def);
-                if (ret == String.Empty)
+                if (def == null)
+                    ret = ReadLine(String.Format("{0}: ", p), false, echo);
+                else
+                    ret = ReadLine(String.Format("{0} [{1}]: ", p, def), false, echo);
+                if (ret == String.Empty && def != null)
                {
                    ret = def;
                }
                else
                {
-                    foreach (char c in excludedCharacters)
+                    if (excludedCharacters != null)
                    {
-                        if (ret.Contains(c.ToString()))
+                        foreach (char c in excludedCharacters)
                        {
-                            System.Console.WriteLine("The character \"" + c.ToString() + "\" is not permitted.");
+                            if (ret.Contains(c.ToString()))
-                            itisdone = false;
+                            {
+                                System.Console.WriteLine("The character \"" + c.ToString() + "\" is not permitted.");
+                                itisdone = false;
+                            }
                        }
                    }
                }
@@ -139,14 +192,14 @@ namespace OpenSim.Framework.Console
        }
        // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
-        public string CmdPrompt(string prompt, string defaultresponse, List<string> options)
+        public virtual string Prompt(string prompt, string defaultresponse, List<string> options)
        {
            bool itisdone = false;
            string optstr = String.Empty;
            foreach (string s in options)
                optstr += " " + s;
-            string temp = CmdPrompt(prompt, defaultresponse);
+            string temp = Prompt(prompt, defaultresponse);
            while (itisdone == false)
            {
                if (options.Contains(temp))
@@ -156,19 +209,12 @@ namespace OpenSim.Framework.Console
                else
                {
                    System.Console.WriteLine("Valid options are" + optstr);
-                    temp = CmdPrompt(prompt, defaultresponse);
+                    temp = Prompt(prompt, defaultresponse);
                }
            }
            return temp;
        }
-        // Displays a prompt and waits for the user to enter a string, then returns that string
-        // (Done with no echo and suitable for passwords)
-        public string PasswdPrompt(string p)
-        {
-            return ReadLine(String.Format("{0}: ", p), false, false);
-        }
        public virtual string ReadLine(string p, bool isCommand, bool e)
        {
            System.Console.Write("{0}", p);
diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs
index bfa05a2..2f73a8d 100644
--- a/OpenSim/Framework/Console/ConsoleUtil.cs
+++ b/OpenSim/Framework/Console/ConsoleUtil.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Console
        {
            if (File.Exists(path))
            {
-                console.OutputFormat("File {0} already exists.  Please move or remove it.", path);
+                console.Output("File {0} already exists.  Please move or remove it.", path);
                return false;
            }
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Console
            if (!UUID.TryParse(rawUuid, out uuid))
            {
                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid uuid", rawUuid);
+                    console.Output("ERROR: {0} is not a valid uuid", rawUuid);
                return false;
            }
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Console
            if (!uint.TryParse(rawLocalId, out localId))
            {
                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid local id", localId);
+                    console.Output("ERROR: {0} is not a valid local id", localId);
                return false;
            }
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.Console
            if (localId == 0)
            {
                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid local id - it must be greater than 0", localId);
+                    console.Output("ERROR: {0} is not a valid local id - it must be greater than 0", localId);
                return false;
            }
@@ -150,7 +150,7 @@ namespace OpenSim.Framework.Console
            }
            if (console != null)
-                console.OutputFormat("ERROR: {0} is not a valid UUID or local id", rawId);
+                console.Output("ERROR: {0} is not a valid UUID or local id", rawId);
            return false;
        }
@@ -167,7 +167,7 @@ namespace OpenSim.Framework.Console
            if (!bool.TryParse(rawConsoleString, out b))
            {
                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a true or false value", rawConsoleString);
+                    console.Output("ERROR: {0} is not a true or false value", rawConsoleString);
                return false;
            }
@@ -187,7 +187,7 @@ namespace OpenSim.Framework.Console
            if (!int.TryParse(rawConsoleInt, out i))
            {
                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid integer", rawConsoleInt);
+                    console.Output("ERROR: {0} is not a valid integer", rawConsoleInt);
                return false;
            }
@@ -207,7 +207,7 @@ namespace OpenSim.Framework.Console
            if (!float.TryParse(rawConsoleInput, out i))
            {
                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid float", rawConsoleInput);
+                    console.Output("ERROR: {0} is not a valid float", rawConsoleInput);
                return false;
            }
@@ -227,7 +227,7 @@ namespace OpenSim.Framework.Console
            if (!double.TryParse(rawConsoleInput, out i))
            {
                if (console != null)
-                    console.OutputFormat("ERROR: {0} is not a valid double", rawConsoleInput);
+                    console.Output("ERROR: {0} is not a valid double", rawConsoleInput);
                return false;
            }
@@ -249,7 +249,7 @@ namespace OpenSim.Framework.Console
                if (i < 0)
                {
                    if (console != null)
-                        console.OutputFormat("ERROR: {0} is not a positive integer", rawConsoleInt);
+                        console.Output("ERROR: {0} is not a positive integer", rawConsoleInt);
                    return false;
                }
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index 476fc15..39351e1 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -46,6 +46,7 @@ namespace OpenSim.Framework.Console
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private string m_historyPath;
        private bool m_historyEnable;
+        private bool m_historytimestamps;
        // private readonly object m_syncRoot = new object();
        private const string LOGLEVEL_NONE = "(none)";
@@ -98,15 +99,30 @@ namespace OpenSim.Framework.Console
            string m_historyFile = startupConfig.GetString("ConsoleHistoryFile", Path.Combine(Util.logsDir(), "OpenSimConsoleHistory.txt"));
            int m_historySize = startupConfig.GetInt("ConsoleHistoryFileLines", 100);
            m_historyPath = Path.GetFullPath(m_historyFile);
-            m_log.InfoFormat("[LOCAL CONSOLE]: Persistent command line history is Enabled, up to {0} lines from file {1}", m_historySize, m_historyPath);
+            m_historytimestamps = startupConfig.GetBoolean("ConsoleHistoryTimeStamp", false);
+            m_log.InfoFormat("[LOCAL CONSOLE]: Persistent command line history is Enabled, up to {0} lines from file {1} {2} timestamps",
+                m_historySize, m_historyPath, m_historytimestamps?"with":"without");
            if (File.Exists(m_historyPath))
            {
+                List<string> originallines = new List<string>();
                using (StreamReader history_file = new StreamReader(m_historyPath))
                {
                    string line;
                    while ((line = history_file.ReadLine()) != null)
                    {
+                        originallines.Add(line);
+                        if(line.StartsWith("["))
+                        {
+                            int indx = line.IndexOf("]:> ");
+                            if(indx > 0)
+                            {
+                                if(indx + 4 >= line.Length)
+                                    line = String.Empty;
+                                else
+                                   line = line.Substring(indx + 4);
+                            }
+                        }
                        m_history.Add(line);
                    }
                }
@@ -114,11 +130,14 @@ namespace OpenSim.Framework.Console
                if (m_history.Count > m_historySize)
                {
                    while (m_history.Count > m_historySize)
+                    {
                        m_history.RemoveAt(0);
+                        originallines.RemoveAt(0);
+                    }
                    using (StreamWriter history_file = new StreamWriter(m_historyPath))
                    {
-                        foreach (string line in m_history)
+                        foreach (string line in originallines)
                        {
                            history_file.WriteLine(line);
                        }
@@ -141,6 +160,8 @@ namespace OpenSim.Framework.Console
            m_history.Add(text);
            if (m_historyEnable)
            {
+                if (m_historytimestamps)
+                    text = String.Format("[{0} {1}]:> {2}", DateTime.Now.ToShortDateString(), DateTime.Now.ToShortTimeString(), text);
                File.AppendAllText(m_historyPath, text + Environment.NewLine);
            }
        }
@@ -338,7 +359,7 @@ namespace OpenSim.Framework.Console
        {
            string outText = text;
-            if (level != LOGLEVEL_NONE)
+            if (level != null)
            {
                MatchCollection matches = m_categoryRegex.Matches(text);
@@ -368,13 +389,33 @@ namespace OpenSim.Framework.Console
            System.Console.WriteLine();
        }
-        public override void Output(string text)
+        public override void Output(string format, params object[] components)
        {
-            Output(text, LOGLEVEL_NONE);
+            string level = null;
-        }
+            if(components != null && components.Length > 0)
+            {
+                if(components[0] == null || components[0] is ConsoleLevel)
+                {
+                    if(components[0] is ConsoleLevel)
+                        level = ((ConsoleLevel)components[0]).ToString();
+                    if (components.Length > 1)
+                    {
+                        object[] tmp = new object[components.Length - 1];
+                        Array.Copy(components, 1, tmp, 0, components.Length - 1);
+                        components = tmp;
+                    }
+                    else
+                        components = null;
+                }
+            }
+            string text;
+            if (components == null || components.Length == 0)
+                text = format;
+            else
+                text = String.Format(format, components);
-        public override void Output(string text, string level)
-        {
            FireOnOutput(text);
            lock (m_commandLine)
@@ -382,7 +423,6 @@ namespace OpenSim.Framework.Console
                if (m_cursorYPosition == -1)
                {
                    WriteLocalText(text, level);
                    return;
                }
diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs
index e1ff720..d314047 100644
--- a/OpenSim/Framework/Console/MockConsole.cs
+++ b/OpenSim/Framework/Console/MockConsole.cs
@@ -30,6 +30,7 @@ using System.Threading;
 using System.Collections.Generic;
 using System.Text;
 using System.Xml;
+using Nini.Config;
 namespace OpenSim.Framework.Console
 {
@@ -56,23 +57,24 @@ namespace OpenSim.Framework.Console
        public string ReadLine(string p, bool isCommand, bool e) { return ""; }
-        public object ConsoleScene {
+        public IScene ConsoleScene {
            get { return null; }
            set {}
        }
-        public void Output(string text, string level) {}
+        public void Output(string format) { }
-        public void Output(string text) {}
+        public void Output(string format, params object[] components) { }
-        public void OutputFormat(string format, params object[] components) {}
-        public string CmdPrompt(string p) { return ""; }
+        public string Prompt(string p) { return ""; }
-        public string CmdPrompt(string p, string def) { return ""; }
+        public string Prompt(string p, string def) { return ""; }
-        public string CmdPrompt(string p, List<char> excludedCharacters) { return ""; }
+        public string Prompt(string p, List<char> excludedCharacters) { return ""; }
-        public string CmdPrompt(string p, string def, List<char> excludedCharacters) { return ""; }
+        public string Prompt(string p, string def, List<char> excludedCharacters, bool echo) { return ""; }
-        public string CmdPrompt(string prompt, string defaultresponse, List<string> options) { return ""; }
+        public string Prompt(string prompt, string defaultresponse, List<string> options) { return ""; }
        public string PasswdPrompt(string p) { return ""; }
+        public void ReadConfig(IConfigSource configSource) { }
    }
    public class MockCommands : ICommands
diff --git a/OpenSim/Framework/Console/OpenSimAppender.cs b/OpenSim/Framework/Console/OpenSimAppender.cs
index 72a251e..39a550b 100644
--- a/OpenSim/Framework/Console/OpenSimAppender.cs
+++ b/OpenSim/Framework/Console/OpenSimAppender.cs
@@ -55,12 +55,14 @@ namespace OpenSim.Framework.Console
            {
                if (m_console != null)
                {
-                    string level = "normal";
+                    ConsoleLevel level;
                    if (le.Level == Level.Error)
                        level = "error";
                    else if (le.Level == Level.Warn)
                        level = "warn";
+                    else
+                        level = "normal";
                    m_console.Output(loggingMessage, level);
                }
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index f59c902..889df36 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -46,6 +46,8 @@ namespace OpenSim.Framework.Console
    //
    public class RemoteConsole : CommandConsole
    {
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        // Connection specific data, indexed by a session ID
        // we create when a client connects.
        protected class ConsoleConnection
@@ -153,7 +155,7 @@ namespace OpenSim.Framework.Console
            m_expireTimer.Start();
        }
-        public void ReadConfig(IConfigSource config)
+        public override void ReadConfig(IConfigSource config)
        {
            m_Config = config;
@@ -188,13 +190,41 @@ namespace OpenSim.Framework.Console
            m_Server.AddHTTPHandler("/SessionCommand/", HandleHttpSessionCommand);
        }
-        public override void Output(string text, string level)
+        public override void Output(string format, params object[] components)
        {
+            string level = null;
+            if (components != null && components.Length > 0)
+            {
+                if (components[0] == null || components[0] is ConsoleLevel)
+                {
+                    if (components[0] is ConsoleLevel)
+                        level = ((ConsoleLevel)components[0]).ToString();
+                    if (components.Length > 1)
+                    {
+                        object[] tmp = new object[components.Length - 1];
+                        Array.Copy(components, 1, tmp, 0, components.Length - 1);
+                        components = tmp;
+                    }
+                    else
+                        components = null;
+                }
+            }
+            string text;
+            if (components == null || components.Length == 0)
+                text = format;
+            else
+                text = String.Format(format, components);
            Output(text, level, false, false, false);
        }
        protected void Output(string text, string level, bool isPrompt, bool isCommand, bool isInput)
        {
+            if (level == null)
+                level = String.Empty;
            // Increment the line number. It was 0 and they start at 1
            // so we need to pre-increment.
            m_lineNumber++;
@@ -228,12 +258,6 @@ namespace OpenSim.Framework.Console
            System.Console.WriteLine(text.Trim());
        }
-        public override void Output(string text)
-        {
-            // Output plain (non-logging style) text.
-            Output(text, String.Empty, false, false, false);
-        }
        public override string ReadLine(string p, bool isCommand, bool e)
        {
            // Output the prompt an prepare to wait. This
@@ -403,7 +427,7 @@ namespace OpenSim.Framework.Console
            string uri = "/ReadResponses/" + sessionID.ToString() + "/";
            m_Server.AddPollServiceHTTPHandler(
-                uri, new PollServiceEventArgs(null, uri, HasEvents, GetEvents, NoEvents, sessionID,25000)); // 25 secs timeout
+                uri, new PollServiceEventArgs(null, uri, HasEvents, GetEvents, NoEvents, null, sessionID,25000)); // 25 secs timeout
            // Our reply is an XML document.
            // TODO: Change this to Linq.Xml
@@ -687,7 +711,6 @@ namespace OpenSim.Framework.Console
            result["int_response_code"] = 200;
            result["content_type"] = "application/xml";
            result["keepalive"] = false;
-            result["reusecontext"] = false;
            result = CheckOrigin(result);
            return result;
@@ -713,7 +736,6 @@ namespace OpenSim.Framework.Console
            result["int_response_code"] = 200;
            result["content_type"] = "text/xml";
            result["keepalive"] = false;
-            result["reusecontext"] = false;
            result = CheckOrigin(result);
            return result;
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs
index 28055b8..e399e27 100644
--- a/OpenSim/Framework/Constants.cs
+++ b/OpenSim/Framework/Constants.cs
@@ -30,13 +30,16 @@ namespace OpenSim.Framework
 {
    public class Constants
    {
+        public const int MaxAgentAttachments = 38;
+        public const int MaxAgentGroups = 60;
        // 'RegionSize' is the legacy region size.
        // DO NOT USE THIS FOR ANY NEW CODE. Use Scene.RegionInfo.RegionSize[XYZ] as a region might not
        //      be the legacy region size.
        public const uint RegionSize = 256;
        public const uint RegionHeight = 16384;
-        // This could be a parameters but, really, a region of greater than this is pretty unmanageable
-        public const uint MaximumRegionSize = 8192;
+        public const uint MaximumRegionSize = 4096;
        // Since terrain is stored in 16x16 heights, regions must be a multiple of this number and that is the minimum
        public const int MinRegionSize = 16;
@@ -83,7 +86,7 @@ namespace OpenSim.Framework
            ViaLogin = 1 << 7,
            /// <summary>Linden Summoned</summary>
            ViaGodlikeLure = 1 << 8,
-            /// <summary>"Linden Forced me" it used to say, but the code says "This user will be a God in the destination scene, too", but then is ignored.</summary>
+            /// <summary>Linden Forced me</summary>
            Godlike = 1 << 9,
            /// <summary></summary>
            NineOneOne = 1 << 10,
@@ -97,8 +100,8 @@ namespace OpenSim.Framework
            ResetHome = 1 << 14,
            /// <summary>forced to new location for example when avatar is banned or ejected</summary>
            ForceRedirect = 1 << 15,
-            /// <summary>Via script.</summary>
+            /// <summary>Via script.</summary>
-            ViaScript = 1 << 16,
+            ViaScript = 1 << 16,
            /// <summary>Via map, though this is a guess.</summary>
            ViaMap = 1 << 17,
            /// <summary>Teleport Finished via a Lure</summary>
@@ -108,8 +111,8 @@ namespace OpenSim.Framework
            /// <summary>Finished, Same Sim</summary>
            FinishedViaSameSim = 1 << 29,
            /// <summary>Agent coming into the grid from another grid</summary>
-            ViaHGLogin = 1 << 30
+            ViaHGLogin = 1 << 30,
+            notViaHGLogin = 0xbffffff
        }
    }
 }
diff --git a/OpenSim/Framework/Culture.cs b/OpenSim/Framework/Culture.cs
index 3d78fac..483f735 100644
--- a/OpenSim/Framework/Culture.cs
+++ b/OpenSim/Framework/Culture.cs
@@ -1,56 +1 @@
-/*
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Globalization;
+using System.Threading;
+namespace OpenSim.Framework
+{
+    public class Culture
+    {
+        private static readonly CultureInfo m_cultureInfo = new CultureInfo("en-US", false);
+        public static NumberFormatInfo NumberFormatInfo
+        {
+            get { return m_cultureInfo.NumberFormat; }
+        }
+        public static IFormatProvider FormatProvider
+        {
+            get { return m_cultureInfo; }
+        }
+        /// <summary>
+        /// Set Culture to en-US to make string processing of numbers simpler.
+        /// </summary>
+        public static void SetCurrentCulture()
+        {
+            Thread.CurrentThread.CurrentCulture = m_cultureInfo;
+        }
+        public static void SetDefaultCurrentCulture()
+        {
+            CultureInfo.DefaultThreadCurrentCulture = m_cultureInfo;
+        }
+        public static CultureInfo GetDefaultCurrentCulture()
+        {
+            return CultureInfo.DefaultThreadCurrentCulture;
+        }
+    }
+}
+\ No newline at end of file
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * 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
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using System;
-using System.Globalization;
-using System.Threading;
-namespace OpenSim.Framework
-{
-    public class Culture
-    {
-        private static readonly CultureInfo m_cultureInfo = new CultureInfo("en-US", false);
-        public static NumberFormatInfo NumberFormatInfo
-        {
-            get { return m_cultureInfo.NumberFormat; }
-        }
-        public static IFormatProvider FormatProvider
-        {
-            get { return m_cultureInfo; }
-        }
-        /// <summary>
-        /// Set Culture to en-US to make string processing of numbers simpler.
-        /// </summary>
-        public static void SetCurrentCulture()
-        {
-            Thread.CurrentThread.CurrentCulture = m_cultureInfo;
-        }
-    }
-}
-\ No newline at end of file
diff --git a/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs b/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
index 816523b..ec26b43 100644
--- a/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
+++ b/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
@@ -41,23 +41,28 @@ namespace OpenSim.Framework
    {
        Dictionary<TKey1, TValue> Dictionary1;
        Dictionary<TKey2, TValue> Dictionary2;
+        private TValue[] m_array;
        ReaderWriterLockSlim rwLock = new ReaderWriterLockSlim();
        public DoubleDictionaryThreadAbortSafe()
        {
            Dictionary1 = new Dictionary<TKey1,TValue>();
            Dictionary2 = new Dictionary<TKey2,TValue>();
+            m_array = null;
        }
        public DoubleDictionaryThreadAbortSafe(int capacity)
        {
            Dictionary1 = new Dictionary<TKey1, TValue>(capacity);
            Dictionary2 = new Dictionary<TKey2, TValue>(capacity);
+            m_array = null;
        }
        ~DoubleDictionaryThreadAbortSafe()
        {
-            rwLock.Dispose();
+            if(rwLock != null)
+                rwLock.Dispose();
        }
        public void Add(TKey1 key1, TKey2 key2, TValue value)
@@ -74,6 +79,8 @@ namespace OpenSim.Framework
                {
                    rwLock.EnterWriteLock();
                    gotLock = true;
+                }
+/*
                    if (Dictionary1.ContainsKey(key1))
                    {
                        if (!Dictionary2.ContainsKey(key2))
@@ -84,9 +91,10 @@ namespace OpenSim.Framework
                        if (!Dictionary1.ContainsKey(key1))
                            throw new ArgumentException("key2 exists in the dictionary but not key1");
                    }
+*/
                    Dictionary1[key1] = value;
                    Dictionary2[key2] = value;
-                }
+                    m_array = null;
            }
            finally
            {
@@ -110,9 +118,10 @@ namespace OpenSim.Framework
                {
                    rwLock.EnterWriteLock();
                    gotLock = true;
-                    Dictionary1.Remove(key1);
-                    success = Dictionary2.Remove(key2);
                }
+                success = Dictionary1.Remove(key1);
+                success &= Dictionary2.Remove(key2);
+                m_array = null;
            }
            finally
            {
@@ -153,6 +162,7 @@ namespace OpenSim.Framework
                            {
                                Dictionary1.Remove(key1);
                                Dictionary2.Remove(kvp.Key);
+                                m_array = null;
                            }
                            found = true;
                            break;
@@ -199,6 +209,7 @@ namespace OpenSim.Framework
                            {
                                Dictionary2.Remove(key2);
                                Dictionary1.Remove(kvp.Key);
+                                m_array = null;
                            }
                            found = true;
                            break;
@@ -231,6 +242,7 @@ namespace OpenSim.Framework
                    gotLock = true;
                    Dictionary1.Clear();
                    Dictionary2.Clear();
+                    m_array = null;
                }
            }
            finally
@@ -313,28 +325,12 @@ namespace OpenSim.Framework
        public void ForEach(Action<TValue> action)
        {
-            bool gotLock = false;
+            TValue[] values = GetArray();
+            if(values == null || values.Length == 0)
+                return;
-            try
+            foreach (TValue value in values)
-            {
+                action(value);
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}
-                finally
-                {
-                    rwLock.EnterReadLock();
-                    gotLock = true;
-                }
-                foreach (TValue value in Dictionary1.Values)
-                    action(value);
-            }
-            finally
-            {
-                if (gotLock)
-                    rwLock.ExitReadLock();
-            }
        }
        public void ForEach(Action<KeyValuePair<TKey1, TValue>> action)
@@ -391,30 +387,12 @@ namespace OpenSim.Framework
        public TValue FindValue(Predicate<TValue> predicate)
        {
-            bool gotLock = false;
+            TValue[] values = GetArray();
+            int len = values.Length;
-            try
+            for (int i = 0; i < len; ++i)
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}
-                finally
-                {
-                    rwLock.EnterReadLock();
-                    gotLock = true;
-                }
-                foreach (TValue value in Dictionary1.Values)
-                {
-                    if (predicate(value))
-                        return value;
-                }
-            }
-            finally
            {
-                if (gotLock)
+                if (predicate(values[i]))
-                    rwLock.ExitReadLock();
+                    return values[i];
            }
            return default(TValue);
@@ -423,32 +401,14 @@ namespace OpenSim.Framework
        public IList<TValue> FindAll(Predicate<TValue> predicate)
        {
            IList<TValue> list = new List<TValue>();
-            bool gotLock = false;
+            TValue[] values = GetArray();
-            try
-            {
-                // Avoid an asynchronous Thread.Abort() from possibly never existing an acquired lock by placing
-                // the acquision inside the main try.  The inner finally block is needed because thread aborts cannot
-                // interrupt code in these blocks (hence gotLock is guaranteed to be set correctly).
-                try {}
-                finally
-                {
-                    rwLock.EnterReadLock();
-                    gotLock = true;
-                }
-                foreach (TValue value in Dictionary1.Values)
+            int len = values.Length;
-                {
+            for (int i = 0; i < len; ++i)
-                    if (predicate(value))
-                        list.Add(value);
-                }
-            }
-            finally
            {
-                if (gotLock)
+                if (predicate(values[i]))
-                    rwLock.ExitReadLock();
+                    list.Add(values[i]);
            }
            return list;
        }
@@ -497,6 +457,7 @@ namespace OpenSim.Framework
                        for (int i = 0; i < list2.Count; i++)
                            Dictionary2.Remove(list2[i]);
+                        m_array = null;
                    }
                }
                finally
@@ -513,5 +474,51 @@ namespace OpenSim.Framework
            return list.Count;
        }
+        public TValue[] GetArray()
+        {
+            bool gotupLock = false;
+            try
+            {
+                try { }
+                finally
+                {
+                    rwLock.EnterUpgradeableReadLock();
+                    gotupLock = true;
+                }
+                if (m_array == null)
+                {
+                    bool gotwritelock = false;
+                    try
+                    {
+                        try { }
+                        finally
+                        {
+                            rwLock.EnterWriteLock();
+                            gotwritelock = true;
+                        }
+                        m_array = new TValue[Dictionary1.Count];
+                        Dictionary1.Values.CopyTo(m_array, 0);
+                    }
+                    finally
+                    {
+                        if (gotwritelock)
+                            rwLock.ExitWriteLock();
+                    }
+                }
+                return m_array;
+            }
+            catch
+            {
+                return new TValue[0];
+            }
+            finally
+            {
+                if (gotupLock)
+                    rwLock.ExitUpgradeableReadLock();
+            }
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/EntityTransferContext.cs b/OpenSim/Framework/EntityTransferContext.cs
index 860414e..257c6d1 100644
--- a/OpenSim/Framework/EntityTransferContext.cs
+++ b/OpenSim/Framework/EntityTransferContext.cs
@@ -58,13 +58,13 @@ namespace OpenSim.Framework
        public void Unpack(OSD data)
        {
            OSDMap map = (OSDMap)data;
+            OSD tmpOSD;
-            if (map.ContainsKey("InboundVersion"))
+            if (map.TryGetValue("InboundVersion", out tmpOSD))
-                InboundVersion = (float)map["InboundVersion"].AsReal();
+                InboundVersion = (float)tmpOSD.AsReal();
-            if (map.ContainsKey("OutboundVersion"))
+            if (map.TryGetValue("OutboundVersion", out tmpOSD))
-                OutboundVersion = (float)map["OutboundVersion"].AsReal();
+                OutboundVersion = (float)tmpOSD.AsReal();
-            if (map.ContainsKey("WearablesCount"))
+            if (map.TryGetValue("WearablesCount", out tmpOSD))
-                WearablesCount = map["WearablesCount"].AsInteger();
+                WearablesCount = tmpOSD.AsInteger();
        }
    }
 }
diff --git a/OpenSim/Framework/EstateBan.cs b/OpenSim/Framework/EstateBan.cs
index 12a92bb..beb7bc9 100644
--- a/OpenSim/Framework/EstateBan.cs
+++ b/OpenSim/Framework/EstateBan.cs
@@ -67,6 +67,9 @@ namespace OpenSim.Framework
            }
        }
+        public UUID BanningUserID { get; set; }
+        public int BanTime { get; set; }
        private string m_bannedHostAddress = string.Empty;
        /// <summary>
        /// IP address or domain name of the banned client.
@@ -137,6 +140,8 @@ namespace OpenSim.Framework
                object value = p.GetValue(this, null);
                if (value is String)
                    p.SetValue(this, map[p.Name], null);
+                else if (value is Int32)
+                    p.SetValue(this, Int32.Parse((string)map[p.Name]), null);
                else if (value is UInt32)
                    p.SetValue(this, UInt32.Parse((string)map[p.Name]), null);
                else if (value is Boolean)
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 8c8270a..1c0b97a 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -44,7 +44,6 @@ namespace OpenSim.Framework
        // Only the client uses these
        //
        private uint m_EstateID = 0;
        public uint EstateID
        {
            get { return m_EstateID; }
@@ -52,7 +51,6 @@ namespace OpenSim.Framework
        }
        private string m_EstateName = "My Estate";
        public string EstateName
        {
            get { return m_EstateName; }
@@ -60,7 +58,6 @@ namespace OpenSim.Framework
        }
        private bool m_AllowLandmark = true;
        public bool AllowLandmark
        {
            get { return m_AllowLandmark; }
@@ -68,7 +65,6 @@ namespace OpenSim.Framework
        }
        private bool m_AllowParcelChanges = true;
        public bool AllowParcelChanges
        {
            get { return m_AllowParcelChanges; }
@@ -76,7 +72,6 @@ namespace OpenSim.Framework
        }
        private bool m_AllowSetHome = true;
        public bool AllowSetHome
        {
            get { return m_AllowSetHome; }
@@ -84,7 +79,6 @@ namespace OpenSim.Framework
        }
        private uint m_ParentEstateID = 1;
        public uint ParentEstateID
        {
            get { return m_ParentEstateID; }
@@ -92,7 +86,6 @@ namespace OpenSim.Framework
        }
        private float m_BillableFactor = 0.0f;
        public float BillableFactor
        {
            get { return m_BillableFactor; }
@@ -100,7 +93,6 @@ namespace OpenSim.Framework
        }
        private int m_PricePerMeter = 1;
        public int PricePerMeter
        {
            get { return m_PricePerMeter; }
@@ -108,7 +100,6 @@ namespace OpenSim.Framework
        }
        private int m_RedirectGridX = 0;
        public int RedirectGridX
        {
            get { return m_RedirectGridX; }
@@ -116,7 +107,6 @@ namespace OpenSim.Framework
        }
        private int m_RedirectGridY = 0;
        public int RedirectGridY
        {
            get { return m_RedirectGridY; }
@@ -126,7 +116,6 @@ namespace OpenSim.Framework
        // Used by the sim
        //
        private bool m_UseGlobalTime = true;
        public bool UseGlobalTime
        {
            get { return m_UseGlobalTime; }
@@ -134,7 +123,6 @@ namespace OpenSim.Framework
        }
        private bool m_FixedSun = false;
        public bool FixedSun
        {
            get { return m_FixedSun; }
@@ -142,7 +130,6 @@ namespace OpenSim.Framework
        }
        private double m_SunPosition = 0.0;
        public double SunPosition
        {
            get { return m_SunPosition; }
@@ -150,7 +137,6 @@ namespace OpenSim.Framework
        }
        private bool m_AllowVoice = true;
        public bool AllowVoice
        {
            get { return m_AllowVoice; }
@@ -158,7 +144,6 @@ namespace OpenSim.Framework
        }
        private bool m_AllowDirectTeleport = true;
        public bool AllowDirectTeleport
        {
            get { return m_AllowDirectTeleport; }
@@ -166,23 +151,22 @@ namespace OpenSim.Framework
        }
        private bool m_DenyAnonymous = false;
        public bool DenyAnonymous
        {
-            get { return m_DenyAnonymous; }
+            get { return (DoDenyAnonymous && m_DenyAnonymous); }
            set { m_DenyAnonymous = value; }
        }
+        // no longer in used, may be reassigned
        private bool m_DenyIdentified = false;
        public bool DenyIdentified
        {
            get { return m_DenyIdentified; }
            set { m_DenyIdentified = value; }
        }
+        // no longer in used, may be reassigned
        private bool m_DenyTransacted = false;
        public bool DenyTransacted
        {
            get { return m_DenyTransacted; }
@@ -190,7 +174,6 @@ namespace OpenSim.Framework
        }
        private bool m_AbuseEmailToEstateOwner = false;
        public bool AbuseEmailToEstateOwner
        {
            get { return m_AbuseEmailToEstateOwner; }
@@ -198,7 +181,6 @@ namespace OpenSim.Framework
        }
        private bool m_BlockDwell = false;
        public bool BlockDwell
        {
            get { return m_BlockDwell; }
@@ -206,7 +188,6 @@ namespace OpenSim.Framework
        }
        private bool m_EstateSkipScripts = false;
        public bool EstateSkipScripts
        {
            get { return m_EstateSkipScripts; }
@@ -214,7 +195,6 @@ namespace OpenSim.Framework
        }
        private bool m_ResetHomeOnTeleport = false;
        public bool ResetHomeOnTeleport
        {
            get { return m_ResetHomeOnTeleport; }
@@ -222,15 +202,13 @@ namespace OpenSim.Framework
        }
        private bool m_TaxFree = false;
+        public bool TaxFree // this is now AllowAccessOverride, keeping same name to reuse DB entries
-        public bool TaxFree
        {
            get { return m_TaxFree; }
            set { m_TaxFree = value; }
        }
        private bool m_PublicAccess = true;
        public bool PublicAccess
        {
            get { return m_PublicAccess; }
@@ -246,7 +224,6 @@ namespace OpenSim.Framework
        }
        private UUID m_EstateOwner = UUID.Zero;
        public UUID EstateOwner
        {
            get { return m_EstateOwner; }
@@ -254,10 +231,9 @@ namespace OpenSim.Framework
        }
        private bool m_DenyMinors = false;
        public bool DenyMinors
        {
-            get { return m_DenyMinors; }
+            get { return (DoDenyMinors && m_DenyMinors); }
            set { m_DenyMinors = value; }
        }
@@ -280,7 +256,6 @@ namespace OpenSim.Framework
        }
        private List<UUID> l_EstateAccess = new List<UUID>();
        public UUID[] EstateAccess
        {
            get { return l_EstateAccess.ToArray(); }
@@ -288,13 +263,15 @@ namespace OpenSim.Framework
        }
        private List<UUID> l_EstateGroups = new List<UUID>();
        public UUID[] EstateGroups
        {
            get { return l_EstateGroups.ToArray(); }
            set { l_EstateGroups = new List<UUID>(value); }
        }
+        public bool DoDenyMinors = true;
+        public bool DoDenyAnonymous = true;
        public EstateSettings()
        {
        }
diff --git a/OpenSim/Framework/GcNotify.cs b/OpenSim/Framework/GcNotify.cs
deleted file mode 100644
index 14a22a6..0000000
--- a/OpenSim/Framework/GcNotify.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * 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
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-using System;
-using System.Reflection;
-using log4net;
-public class GcNotify
-{
-    private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-    public static bool Enabled
-    {
-        get { return s_initialized; }
-        set
-        {
-            if (!s_initialized && value)
-                new GcNotify();
-            s_initialized = value;
-        }
-    }
-    private static bool s_initialized = false;
-    private GcNotify() {}
-    ~GcNotify()
-    {
-        if (!Environment.HasShutdownStarted && !AppDomain.CurrentDomain.IsFinalizingForUnload())
-        {
-            m_log.DebugFormat("[GC NOTIFY]: Garbage collection triggered.");
-            if (Enabled)
-                new GcNotify();
-        }
-    }
-}
-\ No newline at end of file
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index a9044d5..662e470 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -60,9 +60,8 @@ namespace OpenSim.Framework
    public delegate void ObjectAttach(
        IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent);
-    public delegate void ModifyTerrain(UUID user,
+    public delegate void ModifyTerrain(UUID user, float height, float seconds, float brushSize,
-        float height, float seconds, byte size, byte action, float north, float west, float south, float east,
+        byte action, float north, float west, float south, float east, int parcelLocalID);
-        UUID agentId);
    public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes);
@@ -182,10 +181,8 @@ namespace OpenSim.Framework
    public delegate void ParcelAccessListRequest(
        UUID agentID, UUID sessionID, uint flags, int sequenceID, int landLocalID, IClientAPI remote_client);
-    public delegate void ParcelAccessListUpdateRequest(UUID agentID, uint flags,
+    public delegate void ParcelAccessListUpdateRequest(UUID agentID, uint flags, UUID transactionID,
-                    int landLocalID, UUID transactionID, int sequenceID,
+                    int landLocalID, List<LandAccessEntry> entries, IClientAPI remote_client);
-                    int sections, List<LandAccessEntry> entries,
-                    IClientAPI remote_client);
    public delegate void ParcelPropertiesRequest(
        int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);
@@ -392,7 +389,7 @@ namespace OpenSim.Framework
        IClientAPI remoteClient, UUID invoice, UUID senderID, bool scripted, bool collisionEvents, bool physics);
    public delegate void EstateTeleportOneUserHomeRequest(
-        IClientAPI remoteClient, UUID invoice, UUID senderID, UUID prey);
+        IClientAPI remoteClient, UUID invoice, UUID senderID, UUID prey, bool kill);
    public delegate void EstateTeleportAllUsersHomeRequest(IClientAPI remoteClient, UUID invoice, UUID senderID);
@@ -443,7 +440,7 @@ namespace OpenSim.Framework
    public delegate void DeclineCallingCard(IClientAPI remoteClient, UUID transactionID);
    public delegate void SoundTrigger(
-        UUID soundId, UUID ownerid, UUID objid, UUID parentid, double Gain, Vector3 Position, UInt64 Handle, float radius);
+        UUID soundId, UUID ownerid, UUID objid, UUID parentid, double Gain, Vector3 Position, UInt64 Handle);
    public delegate void StartLure(byte lureType, string message, UUID targetID, IClientAPI client);
    public delegate void TeleportLureRequest(UUID lureID, uint teleportFlags, IClientAPI client);
@@ -589,7 +586,6 @@ namespace OpenSim.Framework
    {
        private ISceneEntity m_entity;
        private PrimUpdateFlags m_flags;
-        private int m_updateTime;
        public ISceneEntity Entity
        {
@@ -599,41 +595,42 @@ namespace OpenSim.Framework
        public PrimUpdateFlags Flags
        {
            get { return m_flags; }
+            set { m_flags = value; }
        }
-        public int UpdateTime
+        public virtual void Update()
        {
-            get { return m_updateTime; }
+            // we are on the new one
+            if (m_flags.HasFlag(PrimUpdateFlags.CancelKill))
+            {
+                if (m_flags.HasFlag(PrimUpdateFlags.UpdateProbe))
+                    m_flags = PrimUpdateFlags.UpdateProbe;
+                else
+                    m_flags = PrimUpdateFlags.FullUpdatewithAnim;
+            }
        }
        public virtual void Update(EntityUpdate oldupdate)
        {
            // we are on the new one
            PrimUpdateFlags updateFlags = oldupdate.Flags;
-            if(m_flags.HasFlag(PrimUpdateFlags.CancelKill))
+            if (updateFlags.HasFlag(PrimUpdateFlags.UpdateProbe))
-                m_flags = PrimUpdateFlags.FullUpdate;
+                updateFlags &= ~PrimUpdateFlags.UpdateProbe;
-            else if(updateFlags.HasFlag(PrimUpdateFlags.Kill))
+            if (m_flags.HasFlag(PrimUpdateFlags.CancelKill))
-                return;
+            {
-            else // kill case will just merge in
+                if(m_flags.HasFlag(PrimUpdateFlags.UpdateProbe))
+                    m_flags = PrimUpdateFlags.UpdateProbe;
+                else
+                    m_flags = PrimUpdateFlags.FullUpdatewithAnim;
+            }
+            else
                m_flags |= updateFlags;
-            // Use the older of the updates as the updateTime
-            if (Util.EnvironmentTickCountCompare(UpdateTime, oldupdate.UpdateTime) > 0)
-                m_updateTime = oldupdate.UpdateTime;
        }
        public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags)
        {
            m_entity = entity;
            m_flags = flags;
-            m_updateTime = Util.EnvironmentTickCount();
-        }
-        public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, Int32 updateTime)
-        {
-            m_entity = entity;
-            m_flags = flags;
-            m_updateTime = updateTime;
        }
    }
@@ -684,10 +681,17 @@ namespace OpenSim.Framework
        Particles = 1 << 19,
        ExtraData = 1 << 20,
        Sound = 1 << 21,
-        Joint = 1 << 22,
-        FullUpdate =    0x0fffffff,
+        TerseUpdate = Position | Rotation | Velocity | Acceleration | AngularVelocity,
-        SendInTransit = 0x20000000, 
+        FullUpdate =    0x00ffffff,
-        CancelKill =    0x4fffffff, // 1 << 30 
+        Animations = 1 << 24,
+        FullUpdatewithAnim = FullUpdate | Animations,
+        UpdateProbe   = 0x10000000, // 1 << 28
+        SendInTransit = 0x20000000, // 1 << 29
+        CancelKill =    0x40000000, // 1 << 30 
        Kill =          0x80000000 // 1 << 31
    }
@@ -703,9 +707,11 @@ namespace OpenSim.Framework
    public interface IClientAPI
    {
        Vector3 StartPos { get; set; }
+        float StartFar { get; set; }
        UUID AgentId { get; }
+        UUID ScopeId { get; }
        /// <summary>
        /// The scene agent for this client.  This will only be set if the client has an agent in a scene (i.e. if it
        /// is connected).
@@ -738,9 +744,6 @@ namespace OpenSim.Framework
        List<uint> SelectedObjects { get; }
-        // [Obsolete("LLClientView Specific - Replace with ???")]
-        int NextAnimationSequenceNumber { get; }
        /// <summary>
        /// Returns the full name of the agent/avatar represented by this client
        /// </summary>
@@ -767,6 +770,8 @@ namespace OpenSim.Framework
        bool SendLogoutPacketWhenClosing { set; }
+        int NextAnimationSequenceNumber {get; set;}
        // [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")]
        uint CircuitCode { get; }
@@ -1101,12 +1106,10 @@ namespace OpenSim.Framework
        /// <param name="agentID">The id of the agent associated with the appearance</param>
        /// <param name="visualParams"></param>
        /// <param name="textureEntry"></param>
-        void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry);
+        void SendAppearance(UUID agentID, byte[] visualParams, byte[] textureEntry, float hoverheight);
        void SendCachedTextureResponse(ISceneEntity avatar, int serial, List<CachedTextureResponseArg> cachedTextures);
-        void SendStartPingCheck(byte seq);
        /// <summary>
        /// Tell the client that an object has been deleted
        /// </summary>
@@ -1116,7 +1119,7 @@ namespace OpenSim.Framework
 //        void SendPartFullUpdate(ISceneEntity ent, uint? parentID);
        void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
-        void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
+        void SendRegionHandshake();
        /// <summary>
        /// Send chat to the viewer.
@@ -1140,8 +1143,8 @@ namespace OpenSim.Framework
        bool CanSendLayerData();
-        void SendLayerData(float[] map);
+        void SendLayerData();
-        void SendLayerData(int px, int py, float[] map);
+        void SendLayerData(int[] map);
        void SendWindData(int version, Vector2[] windSpeeds);
        void SendCloudData(int version, float[] cloudCover);
@@ -1232,7 +1235,8 @@ namespace OpenSim.Framework
        /// <param name="node"></param>
        void SendBulkUpdateInventory(InventoryNodeBase node);
-        void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory);
+        void SendXferPacket(ulong xferID, uint packet,
+                byte[] XferData, int XferDataOffset, int XferDatapktLen, bool isTaskInventory);
        void SendAbortXferPacket(ulong xferID);
@@ -1510,5 +1514,6 @@ namespace OpenSim.Framework
        void SendAgentTerseUpdate(ISceneEntity presence);
        void SendPlacesReply(UUID queryID, UUID transactionID, PlacesReplyData[] data);
+        uint GetViewerCaps();
    }
 }
diff --git a/OpenSim/Framework/ICommandConsole.cs b/OpenSim/Framework/ICommandConsole.cs
index 3db2765..043056f 100644
--- a/OpenSim/Framework/ICommandConsole.cs
+++ b/OpenSim/Framework/ICommandConsole.cs
@@ -25,6 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using Nini.Config;
 using System;
 using System.Collections.Generic;
 using System.Xml;
@@ -102,5 +103,7 @@ namespace OpenSim.Framework
        void RunCommand(string cmd);
        string ReadLine(string p, bool isCommand, bool e);
+        void ReadConfig(IConfigSource configSource);
    }
 }
diff --git a/OpenSim/Framework/IConsole.cs b/OpenSim/Framework/IConsole.cs
index 79560d8..ef23cdc 100644
--- a/OpenSim/Framework/IConsole.cs
+++ b/OpenSim/Framework/IConsole.cs
@@ -32,22 +32,19 @@ namespace OpenSim.Framework
 {
    public interface IConsole
    {
-        object ConsoleScene { get; set; }
-        void Output(string text, string level);
-        void Output(string text);
-        void OutputFormat(string format, params object[] components);
-        string CmdPrompt(string p);
+        IScene ConsoleScene { get; set; }
-        string CmdPrompt(string p, string def);
-        string CmdPrompt(string p, List<char> excludedCharacters);
-        string CmdPrompt(string p, string def, List<char> excludedCharacters);
-        // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
+        void Output(string format);
-        string CmdPrompt(string prompt, string defaultresponse, List<string> options);
+        void Output(string format, params object[] components);
+ 
+        string Prompt(string p);
+        string Prompt(string p, string def);
+        string Prompt(string p, List<char> excludedCharacters);
+        string Prompt(string p, string def, List<char> excludedCharacters, bool echo = true);
-        // Displays a prompt and waits for the user to enter a string, then returns that string
+        // Displays a prompt and returns a default value, user may only enter 1 of 2 options
-        // (Done with no echo and suitable for passwords)
+        string Prompt(string prompt, string defaultresponse, List<string> options);
-        string PasswdPrompt(string p);
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs
index 8667837..6f4a07a 100644
--- a/OpenSim/Framework/ILandChannel.cs
+++ b/OpenSim/Framework/ILandChannel.cs
@@ -33,6 +33,8 @@ namespace OpenSim.Region.Framework.Interfaces
 {
    public interface ILandChannel
    {
+        float BanLineSafeHeight {get;}
        /// <summary>
        /// Get all parcels
        /// </summary>
@@ -96,7 +98,6 @@ namespace OpenSim.Region.Framework.Interfaces
        void Join(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id);
        void Subdivide(int start_x, int start_y, int end_x, int end_y, UUID attempting_user_id);
-        void sendClientInitialLandInfo(IClientAPI remoteClient);
+        void sendClientInitialLandInfo(IClientAPI remoteClient, bool overlay);
    }
 }
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index a783256..1f39482 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Framework
        void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client);
        List<LandAccessEntry> CreateAccessListArrayByFlag(AccessList flag);
        void SendAccessList(UUID agentID, UUID sessionID, uint flags, int sequenceID, IClientAPI remote_client);
-        void UpdateAccessList(uint flags, UUID transactionID, int sequenceID, int sections, List<LandAccessEntry> entries, IClientAPI remote_client);
+        void UpdateAccessList(uint flags, UUID transationID, List<LandAccessEntry> entries);
        void UpdateLandBitmapByteArray();
        void SetLandBitmapFromByteArray();
        bool[,] GetLandBitmap();
diff --git a/OpenSim/Framework/ISceneAgent.cs b/OpenSim/Framework/ISceneAgent.cs
index 5d70b83..43e1b08 100644
--- a/OpenSim/Framework/ISceneAgent.cs
+++ b/OpenSim/Framework/ISceneAgent.cs
@@ -70,14 +70,6 @@ namespace OpenSim.Framework
        AvatarAppearance Appearance { get; set; }
        /// <summary>
-        /// Send initial scene data to the client controlling this agent
-        /// </summary>
-        /// <remarks>
-        /// This includes scene object data and the appearance data of other avatars.
-        /// </remarks>
-        void SendInitialDataToMe();
-         /// <summary>
        /// Direction in which the scene presence is looking.
        /// </summary>
        /// <remarks>Will be Vector3.Zero for a child agent.</remarks>
diff --git a/OpenSim/Framework/InventoryCollection.cs b/OpenSim/Framework/InventoryCollection.cs
index 59655eb..a55a1cb 100644
--- a/OpenSim/Framework/InventoryCollection.cs
+++ b/OpenSim/Framework/InventoryCollection.cs
@@ -40,5 +40,6 @@ namespace OpenSim.Framework
        public UUID OwnerID;
        public UUID FolderID;
        public int Version;
+        public int Descendents;
    }
 }
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index c359a0c..dcf078c 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -26,6 +26,7 @@
 */
 using System;
+using System.Text;
 using OpenMetaverse;
 namespace OpenSim.Framework
@@ -415,5 +416,40 @@ namespace OpenSim.Framework
        {
            return MemberwiseClone();
        }
+        public void ToLLSDxml(StringBuilder lsl, uint flagsMask = 0xffffffff)
+        {
+            LLSDxmlEncode.AddMap(lsl);
+                LLSDxmlEncode.AddElem("parent_id", Folder, lsl);
+                LLSDxmlEncode.AddElem("asset_id", AssetID, lsl);
+                LLSDxmlEncode.AddElem("item_id", ID, lsl);
+                LLSDxmlEncode.AddMap("permissions",lsl);
+                    LLSDxmlEncode.AddElem("creator_id", CreatorIdAsUuid, lsl);
+                    LLSDxmlEncode.AddElem("owner_id", Owner, lsl);
+                    LLSDxmlEncode.AddElem("group_id", GroupID, lsl);
+                    LLSDxmlEncode.AddElem("base_mask", (int)CurrentPermissions, lsl);
+                    LLSDxmlEncode.AddElem("owner_mask", (int)CurrentPermissions, lsl);
+                    LLSDxmlEncode.AddElem("group_mask", (int)GroupPermissions, lsl);
+                    LLSDxmlEncode.AddElem("everyone_mask", (int)EveryOnePermissions, lsl);
+                    LLSDxmlEncode.AddElem("next_owner_mask", (int)NextPermissions, lsl);
+                    LLSDxmlEncode.AddElem("is_owner_group", GroupOwned, lsl);
+                LLSDxmlEncode.AddEndMap(lsl);
+                LLSDxmlEncode.AddElem("type", AssetType, lsl);
+                LLSDxmlEncode.AddElem("inv_type", InvType, lsl);
+                LLSDxmlEncode.AddElem("flags", (int)(Flags & flagsMask), lsl);
+                LLSDxmlEncode.AddMap("sale_info",lsl);
+                    LLSDxmlEncode.AddElem("sale_price", SalePrice, lsl);
+                    LLSDxmlEncode.AddElem("sale_type", SaleType, lsl);
+                LLSDxmlEncode.AddEndMap(lsl);
+                LLSDxmlEncode.AddElem("name", Name, lsl);
+                LLSDxmlEncode.AddElem("desc", Description, lsl);
+                LLSDxmlEncode.AddElem("created_at", CreationDate, lsl);
+            LLSDxmlEncode.AddEndMap(lsl);
+        }
    }
 }
diff --git a/OpenSim/Framework/LLSDxmlEncode.cs b/OpenSim/Framework/LLSDxmlEncode.cs
new file mode 100644
index 0000000..97b3ca1
--- /dev/null
+++ b/OpenSim/Framework/LLSDxmlEncode.cs
@@ -0,0 +1,784 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * 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
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+// a class for low level LLSD encoding into a provided StringBuilder
+// for cases where we already need to know the low level detail
+// and so using something like OSD or even protbuf is just a pure waste
+using System;
+using System.Globalization;
+using System.Text;
+using OpenMetaverse;
+namespace OpenSim.Framework
+{
+    public static class LLSDxmlEncode
+    {
+        static readonly  DateTime depoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+        public static void AddStart(StringBuilder sb, bool addxmlversion = false)
+        {
+            if(addxmlversion)
+                sb.Append("<?xml version=\"1.0\" encoding=\"UTF-8\"?><llsd>"); // legacy llsd xml name still valid
+            else
+                sb.Append("<llsd>");
+        }
+        public const string LLSDEmpty = "<llsd><map /></llsd>";
+        // got tired of creating a stringbuilder all the time;
+        public static StringBuilder Start(int size = 256, bool addxmlversion = false)
+        {
+            StringBuilder sb = new StringBuilder(size);
+            if(addxmlversion)
+                sb.Append("<?xml version=\"1.0\" encoding=\"UTF-8\"?><llsd>"); // legacy llsd xml name still valid
+            else
+                sb.Append("<llsd>");
+            return sb;
+        }
+        public static void AddEnd(StringBuilder sb)
+        {
+            sb.Append("</llsd>");
+        }
+        public static string End(StringBuilder sb)
+        {
+            sb.Append("</llsd>");
+            return sb.ToString();
+        }
+        // map == a list of key value pairs
+        public static void AddMap(StringBuilder sb)
+        {
+            sb.Append("<map>");
+        }
+        public static void AddEndMap(StringBuilder sb)
+        {
+            sb.Append("</map>");
+        }
+        public static void AddEmptyMap(StringBuilder sb)
+        {
+            sb.Append("<map />");
+        }
+        // array == a list values
+        public static void AddArray(StringBuilder sb)
+        {
+            sb.Append("<array>");
+        }
+        public static void AddEndArray(StringBuilder sb)
+        {
+            sb.Append("</array>");
+        }
+        public static void AddEndMapAndArray(StringBuilder sb)
+        {
+            sb.Append("</map></array>");
+        }
+        public static void AddEmptyArray(StringBuilder sb)
+        {
+            sb.Append("<array />");
+        }
+        // undefined or null
+        public static void AddUnknownElem(StringBuilder sb)
+        {
+            sb.Append("<undef />");
+        }
+        public static void AddElem(bool e, StringBuilder sb)
+        {
+            if(e)
+                sb.Append("<boolean>1</boolean>");
+            else
+                sb.Append("<boolean />");
+        }
+        public static void AddElem(byte e, StringBuilder sb)
+        {
+            if(e == 0)
+                sb.Append("<integer />");
+            else
+            {
+                sb.Append("<integer>");
+                sb.Append(e.ToString());     
+                sb.Append("</integer>");
+            }
+        }
+        public static void AddElem(byte[] e, StringBuilder sb)
+        {
+            if(e == null || e.Length == 0)
+                sb.Append("binary />");
+            else
+            {
+                sb.Append("<binary>"); // encode64 is default
+                sb.Append(Convert.ToBase64String(e,Base64FormattingOptions.None));     
+                sb.Append("</binary>");
+            }
+        }
+        public static void AddElem(int e, StringBuilder sb)
+        {
+            if(e == 0)
+                sb.Append("<integer />");
+            else
+            {
+                sb.Append("<integer>");
+                sb.Append(e.ToString());
+                sb.Append("</integer>");
+            }
+        }
+        public static void AddElem(uint e, StringBuilder sb)
+        {
+            AddElem(uintToByteArray(e), sb);
+        }
+        public static void AddElem(ulong e, StringBuilder sb)
+        {
+            AddElem(ulongToByteArray(e), sb);
+        }
+        public static void AddElem(float e, StringBuilder sb)
+        {
+            if(e == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+        }
+        public static void AddElem(Vector2 e, StringBuilder sb)
+        {
+            sb.Append("<array>");
+            if(e.X == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+            if(e.Y == 0)
+                sb.Append("<real /></array>");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.Y.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real></array>");
+            }
+        }
+        public static void AddElem(Vector3 e, StringBuilder sb)
+        {
+            sb.Append("<array>");
+            if(e.X == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+            if(e.Y == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.Y.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+            if(e.Z == 0)
+                sb.Append("<real /></array>");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.Z.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real></array>");
+            }
+        }
+        public static void AddElem(Quaternion e, StringBuilder sb)
+        {
+            sb.Append("<array><key>x</key>");
+            if(e.X == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+            if(e.Y == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.Y.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+            if(e.Z == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.Z.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+            if(e.W == 0)
+                sb.Append("<real /></array>");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.W.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real></array>");
+            }
+        }
+        public static void AddElem(double e, StringBuilder sb)
+        {
+            if(e == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+        }
+        public static void AddElem(UUID e, StringBuilder sb)
+        {
+            if(e == UUID.Zero)
+                sb.Append("<uuid />");
+            else
+            {
+                sb.Append("<uuid>");
+                EscapeToXML(e.ToString(), sb);     
+                sb.Append("</uuid>");
+            }
+        }
+        public static void AddElem(string e, StringBuilder sb)
+        {
+            if(String.IsNullOrEmpty(e))
+                sb.Append("<string />");
+            else
+            {
+                sb.Append("<string>");
+                EscapeToXML(e, sb);
+                sb.Append("</string>");
+            }
+        }
+        public static void AddRawElem(string e, StringBuilder sb)
+        {
+            if(String.IsNullOrEmpty(e))
+                return;
+            sb.Append(e);     
+        }
+        public static void AddElem(Uri e, StringBuilder sb)
+        {
+            if(e == null)
+            {
+                sb.Append("<uri />");
+                return;
+            }
+            string s;
+            if (e.IsAbsoluteUri)
+                s = e.AbsoluteUri;
+            else
+                s = e.ToString();
+            if(String.IsNullOrEmpty(s))
+                sb.Append("<uri />");
+            else
+            {
+                sb.Append("<uri>");
+                sb.Append(s);     
+                sb.Append("</uri>");
+            }
+        }
+        public static void AddElem(DateTime e, StringBuilder sb)
+        {
+            DateTime u = e.ToUniversalTime();
+            if(u == depoch)
+            {
+                sb.Append("<date />");
+                return;
+            }    
+            string format;
+            if(u.Hour == 0 && u.Minute == 0 && u.Second == 0)
+                format = "yyyy-MM-dd";
+            else if (u.Millisecond > 0)
+                format = "yyyy-MM-ddTHH:mm:ss.ffZ";
+            else
+                format = "yyyy-MM-ddTHH:mm:ssZ";
+            sb.Append("<date>");
+            sb.Append(u.ToString(format,CultureInfo.InvariantCulture));
+            sb.Append("</date>");
+        }
+//************ key value *******************
+// assumes name is a valid llsd key
+        public static void AddMap(string name, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key><map>");
+        }
+        public static void AddEmptyMap(string name, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key><map />");
+        }
+        // array == a list values
+        public static void AddArray(string name, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key><array>");
+        }
+        public static void AddArrayAndMap(string name, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key><array><map>");
+        }
+        public static void AddEmptyArray(string name, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key><array />");
+        }
+        // undefined or null
+        public static void AddUnknownElem(string name, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key><undef />");
+        }
+        public static void AddElem(string name, bool e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key>");
+            if(e)
+                sb.Append("<boolean>1</boolean>");
+            else
+                sb.Append("<boolean />");
+        }
+        public static void AddElem(string name, byte e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key>");
+            if(e == 0)
+                sb.Append("<integer />");
+            else
+            {
+                sb.Append("<integer>");
+                sb.Append(e.ToString());
+                sb.Append("</integer>");
+            }
+        }
+        public static void AddElem(string name, byte[] e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key>");
+            if(e == null || e.Length == 0)
+                sb.Append("binary />");
+            else
+            {
+                sb.Append("<binary>"); // encode64 is default
+                sb.Append(Convert.ToBase64String(e,Base64FormattingOptions.None));
+                sb.Append("</binary>");
+            }
+        }
+        public static void AddElem(string name, int e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key>");
+            if(e == 0)
+                sb.Append("<integer />");
+            else
+            {
+                sb.Append("<integer>");
+                sb.Append(e.ToString());
+                sb.Append("</integer>");
+            }
+        }
+        public static void AddElem(string name, uint e, StringBuilder sb)
+        {
+            AddElem(name, uintToByteArray(e), sb);
+        }
+        public static void AddElem(string name, ulong e, StringBuilder sb)
+        {
+            AddElem(name, ulongToByteArray(e), sb);
+        }
+        public static void AddElem(string name, float e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key>");
+            if(e == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.ToString(CultureInfo.InvariantCulture));     
+                sb.Append("</real>");
+            }
+        }
+        public static void AddElem(string name, Vector2 e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key><array>>");
+            if(e.X == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+            if(e.Y == 0)
+                sb.Append("<real /></array>");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.Y.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real></array>");
+            }
+        }
+        public static void AddElem(string name, Vector3 e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key><array>");
+            if(e.X == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+            if(e.Y == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.Y.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+            if(e.Z == 0)
+                sb.Append("<real /></array>");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.Z.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real></array>");
+            }
+        }
+        public static void AddElem(string name, Quaternion e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key><array>");
+            if(e.X == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.X.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+            if(e.Y == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.Y.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+            if(e.Z == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.Z.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+            if(e.W == 0)
+                sb.Append("<real /></array>");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.W.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real></array>");
+            }
+        }
+        public static void AddElem(string name, double e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key>");
+            if(e == 0)
+                sb.Append("<real />");
+            else
+            {
+                sb.Append("<real>");
+                sb.Append(e.ToString(CultureInfo.InvariantCulture));
+                sb.Append("</real>");
+            }
+        }
+        public static void AddElem(string name, UUID e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key>");
+            if(e == UUID.Zero)
+                sb.Append("<uuid />");
+            else
+            {
+                sb.Append("<uuid>");
+                EscapeToXML(e.ToString(), sb);     
+                sb.Append("</uuid>");
+            }
+        }
+        public static void AddElem(string name, string e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key>");
+            if(String.IsNullOrEmpty(e))
+                sb.Append("<string />");
+            else
+            {
+                sb.Append("<string>");
+                EscapeToXML(e, sb);
+                sb.Append("</string>");
+            }
+        }
+        public static void AddRawElem(string name, string e, StringBuilder sb)
+        {
+            if (String.IsNullOrEmpty(e))
+                return;
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key>");
+            sb.Append(e);
+        }
+        public static void AddElem(string name, Uri e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key>");
+            if(e == null)
+            {
+                sb.Append("<uri />");
+                return;
+            }
+            string s;
+            if (e.IsAbsoluteUri)
+                s = e.AbsoluteUri;
+            else
+                s = e.ToString();
+            if(String.IsNullOrEmpty(s))
+                sb.Append("<uri />");
+            else
+            {
+                sb.Append("<uri>");
+                sb.Append(s);     
+                sb.Append("</uri>");
+            }
+        }
+        public static void AddElem(string name, DateTime e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key>");
+            DateTime u = e.ToUniversalTime();
+            if(u == depoch)
+            {
+                sb.Append("<date />");
+                return;
+            }    
+            string format;
+            if(u.Hour == 0 && u.Minute == 0 && u.Second == 0)
+                format = "yyyy-MM-dd";
+            else if (u.Millisecond > 0)
+                format = "yyyy-MM-ddTHH:mm:ss.ffZ";
+            else
+                format = "yyyy-MM-ddTHH:mm:ssZ";
+            sb.Append("<date>");
+            sb.Append(u.ToString(format,CultureInfo.InvariantCulture));
+            sb.Append("</date>");
+        }
+        public static void AddLLSD(string e, StringBuilder sb)
+        {
+            sb.Append(e);
+        }
+        public static void AddLLSD(string name, string e, StringBuilder sb)
+        {
+            sb.Append("<key>");
+            sb.Append(name);
+            sb.Append("</key>");
+            sb.Append(e);
+        }
+        public static void EscapeToXML(string s, StringBuilder sb)
+        {
+            int i;
+            char c;
+            int len = s.Length;
+            for (i = 0; i < len; i++)
+            {
+                c = s[i];
+                switch (c)
+                {
+                    case '<':
+                        sb.Append("&lt;");
+                        break;
+                    case '>':
+                        sb.Append("&gt;");
+                        break;
+                    case '&':
+                        sb.Append("&amp;");
+                        break;
+                    case '"':
+                        sb.Append("&quot;");
+                        break;
+                    case '\\':
+                        sb.Append("&apos;");
+                        break;
+                    default:
+                        sb.Append(c);
+                        break;
+                }
+            }
+        }
+        public static byte[] ulongToByteArray(ulong uLongValue)
+        {
+            return new byte[8]
+            {
+                (byte)(uLongValue >> 56),
+                (byte)(uLongValue >> 48),
+                (byte)(uLongValue >> 40),
+                (byte)(uLongValue >> 32),
+                (byte)(uLongValue >> 24),
+                (byte)(uLongValue >> 16),
+                (byte)(uLongValue >> 8),
+                (byte)uLongValue
+            };
+        }
+        public static byte[] uintToByteArray(uint value)
+        {
+            return new byte[4]
+            {
+                (byte)(value >> 24),
+                (byte)(value >> 16),
+                (byte)(value >> 8),
+                (byte)value
+            };
+        }
+    }
+}
diff --git a/OpenSim/Framework/Login.cs b/OpenSim/Framework/Login.cs
index 54a6654..b8a24ea 100644
--- a/OpenSim/Framework/Login.cs
+++ b/OpenSim/Framework/Login.cs
@@ -42,11 +42,13 @@ namespace OpenSim.Framework
        public UUID SecureSession = UUID.Zero;
        public UUID Session;
        public Vector3 StartPos;
+        public float StartFar;
        public AvatarAppearance Appearance;
        public Login()
        {
            StartPos = new Vector3(128, 128, 70);
+            StartFar = -1;
        }
    }
 }
diff --git a/OpenSim/Framework/MapAndArray.cs b/OpenSim/Framework/MapAndArray.cs
index 32d6978..e6b2800 100644
--- a/OpenSim/Framework/MapAndArray.cs
+++ b/OpenSim/Framework/MapAndArray.cs
@@ -41,14 +41,14 @@ namespace OpenSim.Framework
    {
        private Dictionary<TKey, TValue> m_dict;
        private TValue[] m_array;
-        private object m_syncRoot = new object();
        /// <summary>Number of values currently stored in the collection</summary>
-        public int Count { get { return m_array.Length; } }
+        public int Count { get { return m_dict.Count; } }
        /// <summary>NOTE: This collection is thread safe. You do not need to
        /// acquire a lock to add, remove, or enumerate entries. This
        /// synchronization object should only be locked for larger
        /// transactions</summary>
+        private object m_syncRoot = new object();
        public object SyncRoot { get { return m_syncRoot; } }
        /// <summary>
@@ -57,7 +57,7 @@ namespace OpenSim.Framework
        public MapAndArray()
        {
            m_dict = new Dictionary<TKey, TValue>();
-            m_array = new TValue[0];
+            m_array = null;
        }
        /// <summary>
@@ -67,7 +67,7 @@ namespace OpenSim.Framework
        public MapAndArray(int capacity)
        {
            m_dict = new Dictionary<TKey, TValue>(capacity);
-            m_array = new TValue[0];
+            m_array = null;
        }
        /// <summary>
@@ -85,7 +85,7 @@ namespace OpenSim.Framework
                bool containedKey = m_dict.ContainsKey(key);
                m_dict[key] = value;
-                CreateArray();
+                m_array = null;
                return !containedKey;
            }
@@ -103,8 +103,8 @@ namespace OpenSim.Framework
            lock (m_syncRoot)
            {
                m_dict.Add(key, value);
-                CreateArray();
+                m_array = null;
-                return m_array.Length;
+                return m_dict.Count;
            }
        }
@@ -118,8 +118,7 @@ namespace OpenSim.Framework
            lock (m_syncRoot)
            {
                bool removed = m_dict.Remove(key);
-                CreateArray();
+                m_array = null;
                return removed;
            }
        }
@@ -158,7 +157,7 @@ namespace OpenSim.Framework
            lock (m_syncRoot)
            {
                m_dict = new Dictionary<TKey, TValue>();
-                m_array = new TValue[0];
+                m_array = null;
            }
        }
@@ -170,20 +169,17 @@ namespace OpenSim.Framework
        /// values</returns>
        public TValue[] GetArray()
        {
-            return m_array;
+            lock (m_syncRoot)
-        }
+            {
+                if (m_array == null)
-        private void CreateArray()
+                {
-        {
+                    if(m_dict.Count == 0)
-            // Rebuild the array from the dictionary. This method must be
+                        return new TValue[0];
-            // called from inside a lock
+                    m_array = new TValue[m_dict.Count];
-            TValue[] array = new TValue[m_dict.Count];
+                    m_dict.Values.CopyTo(m_array, 0);
-            int i = 0;
+                }
+                return m_array;
-            foreach (TValue value in m_dict.Values)
+            }
-                array[i++] = value;
-            m_array = array;
        }
    }
 }
diff --git a/OpenSim/Framework/MinHeap.cs b/OpenSim/Framework/MinHeap.cs
index 99ac25d..2731e99 100644
--- a/OpenSim/Framework/MinHeap.cs
+++ b/OpenSim/Framework/MinHeap.cs
@@ -45,8 +45,8 @@ namespace OpenSim.Framework
            internal void Clear()
            {
-                this.index = -1;
+                index = -1;
-                this.heap = null;
+                heap = null;
            }
        }
@@ -55,23 +55,26 @@ namespace OpenSim.Framework
            internal T value;
            internal Handle handle;
-            internal HeapItem(T value, Handle handle)
+            internal HeapItem(T _value, Handle _handle)
            {
-                this.value = value;
+                value = _value;
-                this.handle = handle;
+                handle = _handle;
            }
            internal void Clear()
            {
-                if (this.handle != null)
+                if (handle != null)
-                    this.handle.Clear();
+                {
-                ClearRef();
+                    handle.heap = null;
+                    handle = null;
+                }               
+                value = default(T);
            }
            internal void ClearRef()
            {
-                this.value = default(T);
+                value = default(T);
-                this.handle = null;
+                handle = null;
            }
        }
@@ -81,6 +84,7 @@ namespace OpenSim.Framework
        private int size;
        private object sync_root;
        private int version;
+        private int minCapacity;
        private Comparison<T> comparison;
@@ -90,14 +94,15 @@ namespace OpenSim.Framework
        public MinHeap(int capacity, IComparer<T> comparer) :
            this(capacity, new Comparison<T>(comparer.Compare)) { }
        public MinHeap(Comparison<T> comparison) : this(DEFAULT_CAPACITY, comparison) { }
-        public MinHeap(int capacity, Comparison<T> comparison)
+        public MinHeap(int _capacity, Comparison<T> _comparison)
        {
-            this.items = new HeapItem[capacity];
+            minCapacity = 16;
-            this.comparison = comparison;
+            items = new HeapItem[_capacity];
-            this.size = this.version = 0;
+            comparison = _comparison;
+            size = version = 0;
        }
-        public int Count { get { return this.size; } }
+        public int Count { get { return size; } }
        public bool IsReadOnly { get { return false; } }
@@ -108,15 +113,16 @@ namespace OpenSim.Framework
            get
            {
                Handle handle = ValidateThisHandle(key);
-                return this.items[handle.index].value;
+                return items[handle.index].value;
            }
            set
            {
                Handle handle = ValidateThisHandle(key);
-                this.items[handle.index].value = value;
+                int indx = handle.index;
-                if (!BubbleUp(handle.index))
+                items[indx].value = value;
-                    BubbleDown(handle.index);
+                if (!BubbleUp(indx))
+                    BubbleDown(indx);
            }
        }
@@ -124,9 +130,9 @@ namespace OpenSim.Framework
        {
            get
            {
-                if (this.sync_root == null)
+                if (sync_root == null)
-                    Interlocked.CompareExchange<object>(ref this.sync_root, new object(), null);
+                    Interlocked.CompareExchange<object>(ref sync_root, new object(), null);
-                return this.sync_root;
+                return sync_root;
            }
        }
@@ -152,27 +158,27 @@ namespace OpenSim.Framework
        private void Set(HeapItem item, int index)
        {
-            this.items[index] = item;
+            items[index] = item;
            if (item.handle != null)
                item.handle.index = index;
        }
        private bool BubbleUp(int index)
        {
-            HeapItem item = this.items[index];
+            HeapItem item = items[index];
            int current, parent;
            for (current = index, parent = (current - 1) / 2;
-                (current > 0) && (this.comparison(this.items[parent].value, item.value)) > 0;
+                    (current > 0) && (comparison(items[parent].value, item.value)) > 0;
-                current = parent, parent = (current - 1) / 2)
+                    current = parent, parent = (current - 1) / 2)
            {
-                Set(this.items[parent], current);
+                Set(items[parent], current);
            }
            if (current != index)
            {
                Set(item, current);
-                ++this.version;
+                ++version;
                return true;
            }
            return false;
@@ -180,24 +186,25 @@ namespace OpenSim.Framework
        private void BubbleDown(int index)
        {
-            HeapItem item = this.items[index];
+            HeapItem item = items[index];
-            int current, child;
+            int current;
+            int child;
-            for (current = index, child = (2 * current) + 1;
+            for(current = index , child = (2 * current) + 1;
-                current < this.size / 2;
+                        current < size / 2;
-                current = child, child = (2 * current) + 1)
+                        current = child, child = (2 * current) + 1)
            {
-                if ((child < this.size - 1) && this.comparison(this.items[child].value, this.items[child + 1].value) > 0)
+                if ((child < size - 1) && comparison(items[child].value, items[child + 1].value) > 0)
                    ++child;
-                if (this.comparison(this.items[child].value, item.value) >= 0)
+                if (comparison(items[child].value, item.value) >= 0)
                    break;
-                Set(this.items[child], current);
+                Set(items[child], current);
            }
            if (current != index)
            {
                Set(item, current);
-                ++this.version;
+                ++version;
            }
        }
@@ -206,7 +213,7 @@ namespace OpenSim.Framework
            Handle handle = ValidateHandle(key);
            if (handle.index > -1)
            {
-                value = this.items[handle.index].value;
+                value = items[handle.index].value;
                return true;
            }
            value = default(T);
@@ -228,12 +235,12 @@ namespace OpenSim.Framework
        public void Add(T value, IHandle ihandle)
        {
-            if (this.size == this.items.Length)
+            if (size == items.Length)
            {
-                int capacity = (int)((this.items.Length * 200L) / 100L);
+                int newcapacity = (int)((items.Length * 200L) / 100L);
-                if (capacity < (this.items.Length + DEFAULT_CAPACITY))
+                if (newcapacity < (items.Length + DEFAULT_CAPACITY))
-                    capacity = this.items.Length + DEFAULT_CAPACITY;
+                    newcapacity = items.Length + DEFAULT_CAPACITY;
-                Array.Resize<HeapItem>(ref this.items, capacity);
+                Array.Resize<HeapItem>(ref items, newcapacity);
            }
            Handle handle = null;
@@ -245,8 +252,8 @@ namespace OpenSim.Framework
            HeapItem item = new MinHeap<T>.HeapItem(value, handle);
-            Set(item, this.size);
+            Set(item, size);
-            BubbleUp(this.size++);
+            BubbleUp(size++);
        }
        public void Add(T value)
@@ -256,50 +263,57 @@ namespace OpenSim.Framework
        public T Min()
        {
-            if (this.size == 0)
+            if (size == 0)
                throw new InvalidOperationException("Heap is empty");
-            return this.items[0].value;
+            return items[0].value;
        }
        public void Clear()
        {
-            for (int index = 0; index < this.size; ++index)
+            for (int index = 0; index < size; ++index)
-                this.items[index].Clear();
+                items[index].Clear();
-            this.size = 0;
+            size = 0;
-            ++this.version;
+            if(items.Length > minCapacity)
+                items = new HeapItem[minCapacity];
+            ++version;
        }
        public void TrimExcess()
        {
-            int length = (int)(this.items.Length * 0.9);
+            int length = (int)(items.Length * 0.9);
-            if (this.size < length)
+            if (size < length)
-                Array.Resize<HeapItem>(ref this.items, Math.Min(this.size, DEFAULT_CAPACITY));
+                Array.Resize<HeapItem>(ref items, Math.Min(size, minCapacity));
        }
        private void RemoveAt(int index)
        {
-            if (this.size == 0)
+            if (size == 0)
                throw new InvalidOperationException("Heap is empty");
-            if (index >= this.size)
+            if (index >= size)
                throw new ArgumentOutOfRangeException("index");
-            this.items[index].Clear();
+            items[index].Clear();
-            if (--this.size > 0 && index != this.size)
+            --size;
-            {
+            if (size > 0)
-                Set(this.items[this.size], index);
+            {   if(index != size)
-                this.items[this.size].ClearRef();
+                {
-                if (!BubbleUp(index))
+                    Set(items[size], index);
-                    BubbleDown(index);
+                    items[size].ClearRef();
+                    if (!BubbleUp(index))
+                        BubbleDown(index);
+                }
            }
+            else if(items.Length > 4 * minCapacity)
+                items = new HeapItem[minCapacity];
        }
        public T RemoveMin()
        {
-            if (this.size == 0)
+            if (size == 0)
                throw new InvalidOperationException("Heap is empty");
-            HeapItem item = this.items[0];
+            HeapItem item = items[0];
            RemoveAt(0);
            return item.value;
        }
@@ -307,7 +321,7 @@ namespace OpenSim.Framework
        public T Remove(IHandle ihandle)
        {
            Handle handle = ValidateThisHandle(ihandle);
-            HeapItem item = this.items[handle.index];
+            HeapItem item = items[handle.index];
            RemoveAt(handle.index);
            return item.value;
        }
@@ -317,9 +331,9 @@ namespace OpenSim.Framework
            EqualityComparer<T> comparer = EqualityComparer<T>.Default;
            int index;
-            for (index = 0; index < this.size; ++index)
+            for (index = 0; index < size; ++index)
            {
-                if (comparer.Equals(this.items[index].value, value))
+                if (comparer.Equals(items[index].value, value))
                    return index;
            }
            return -1;
@@ -356,8 +370,8 @@ namespace OpenSim.Framework
            if ((length - index) < this.size)
                throw new ArgumentException("Not enough space available in array starting at index");
-            for (int i = 0; i < this.size; ++i)
+            for (int i = 0; i < size; ++i)
-                array[index + i] = this.items[i].value;
+                array[index + i] = items[i].value;
        }
        public void CopyTo(Array array, int index)
@@ -372,13 +386,13 @@ namespace OpenSim.Framework
            int length = array.Length;
            if ((index < 0) || (index > length))
                throw new ArgumentOutOfRangeException("index");
-            if ((length - index) < this.size)
+            if ((length - index) < size)
                throw new ArgumentException("Not enough space available in array starting at index");
            try
            {
-                for (int i = 0; i < this.size; ++i)
+                for (int i = 0; i < size; ++i)
-                    array.SetValue(this.items[i].value, index + i);
+                    array.SetValue(items[i].value, index + i);
            }
            catch (ArrayTypeMismatchException)
            {
@@ -388,13 +402,13 @@ namespace OpenSim.Framework
        public IEnumerator<T> GetEnumerator()
        {
-            int version = this.version;
+            int cversion = version;
-            for (int index = 0; index < this.size; ++index)
+            for (int index = 0; index < size; ++index)
            {
-                if (version != this.version)
+                if (cversion != version)
                    throw new InvalidOperationException("Heap was modified while enumerating");
-                yield return this.items[index].value;
+                yield return items[index].value;
            }
        }
diff --git a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
index e513abd..7119964 100644
--- a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
@@ -48,28 +48,25 @@ namespace OpenSim.Framework.Monitoring
                Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0));
            sb.AppendFormat(
-                "Last heap allocation rate   : {0} MB/s\n",
+                "Heap allocation rate (last/avg): {0}/{1}MB/s\n",
-                Math.Round((MemoryWatchdog.LastHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
+                Math.Round((MemoryWatchdog.LastHeapAllocationRate * 1000) / 1048576.0, 3),
+                Math.Round((MemoryWatchdog.AverageHeapAllocationRate * 1000) / 1048576.0, 3));
-            sb.AppendFormat(
-                "Average heap allocation rate: {0} MB/s\n",
-                Math.Round((MemoryWatchdog.AverageHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
-            Process myprocess = Process.GetCurrentProcess();
-//            if (!myprocess.HasExited)
            try
            {
-                myprocess.Refresh();
+                using (Process myprocess = Process.GetCurrentProcess())
-                sb.AppendFormat(
+                {
-                        "Process memory:      Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n",
+                    sb.AppendFormat(
-                        Math.Round(myprocess.WorkingSet64 / 1024.0 / 1024.0),
+                            "Process memory:      Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n",
-                        Math.Round(myprocess.PagedMemorySize64 / 1024.0 / 1024.0),
+                            Math.Round(myprocess.WorkingSet64 / 1024.0 / 1024.0),
-                        Math.Round(myprocess.VirtualMemorySize64 / 1024.0 / 1024.0));
+                            Math.Round(myprocess.PagedMemorySize64 / 1024.0 / 1024.0),
-                sb.AppendFormat(
+                            Math.Round(myprocess.VirtualMemorySize64 / 1024.0 / 1024.0));
-                        "Peak process memory: Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n",
+                    sb.AppendFormat(
-                        Math.Round(myprocess.PeakWorkingSet64 / 1024.0 / 1024.0),
+                            "Peak process memory: Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n",
-                        Math.Round(myprocess.PeakPagedMemorySize64 / 1024.0 / 1024.0),
+                            Math.Round(myprocess.PeakWorkingSet64 / 1024.0 / 1024.0),
-                        Math.Round(myprocess.PeakVirtualMemorySize64 / 1024.0 / 1024.0));
+                            Math.Round(myprocess.PeakPagedMemorySize64 / 1024.0 / 1024.0),
+                            Math.Round(myprocess.PeakVirtualMemorySize64 / 1024.0 / 1024.0));
+                }
            }
            catch
            { }
diff --git a/OpenSim/Framework/Monitoring/ChecksManager.cs b/OpenSim/Framework/Monitoring/ChecksManager.cs
index ff3b041..f719099 100644
--- a/OpenSim/Framework/Monitoring/ChecksManager.cs
+++ b/OpenSim/Framework/Monitoring/ChecksManager.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Monitoring
                        con.Output("check categories available are:");
                        foreach (string category in RegisteredChecks.Keys)
-                            con.OutputFormat("  {0}", category);
+                            con.Output("  {0}", category);
                    }
 //                    else
 //                    {
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs
index 7264c25..6c388b3 100644
--- a/OpenSim/Framework/Monitoring/JobEngine.cs
+++ b/OpenSim/Framework/Monitoring/JobEngine.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Monitoring
        /// </remarks>
        private bool m_warnOverMaxQueue = true;
-        private BlockingCollection<Job> m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000);
+        private BlockingCollection<Job> m_jobQueue = new BlockingCollection<Job>(5000);
        private CancellationTokenSource m_cancelSource;
@@ -194,7 +194,7 @@ namespace OpenSim.Framework.Monitoring
            {
                if(!IsRunning)
                    return false;
+                
                if(!m_threadRunnig)
                {
                     WorkManager.RunInThreadPool(ProcessRequests, null, Name, false);
@@ -238,7 +238,7 @@ namespace OpenSim.Framework.Monitoring
                        break;
                    }
                }
-                catch (ObjectDisposedException)
+                catch(ObjectDisposedException)
                {
                    m_log.DebugFormat("[JobEngine] {0} stopping ignoring {1} jobs in queue",
                        Name,m_jobQueue.Count);
diff --git a/OpenSim/Framework/Monitoring/MemoryWatchdog.cs b/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
index c474622..f2e47f8 100644
--- a/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
+++ b/OpenSim/Framework/Monitoring/MemoryWatchdog.cs
@@ -110,20 +110,17 @@ namespace OpenSim.Framework.Monitoring
            long memoryNow = GC.GetTotalMemory(false);
            long memoryDiff = memoryNow - m_lastUpdateMemory;
-            if (memoryDiff >= 0)
+            if (m_samples.Count >= m_maxSamples)
-            {
-                if (m_samples.Count >= m_maxSamples)
                    m_samples.Dequeue();
-                double elapsed = Util.EnvironmentTickCountSubtract(now, m_lastUpdateTick);
+            double elapsed = Util.EnvironmentTickCountSubtract(now, m_lastUpdateTick);
-                // This should never happen since it's not useful for updates to occur with no time elapsed, but
+            // This should never happen since it's not useful for updates to occur with no time elapsed, but
-                // protect ourselves from a divide-by-zero just in case.
+            // protect ourselves from a divide-by-zero just in case.
-                if (elapsed == 0)
+            if (elapsed == 0)
-                    return;
+                return;
-                m_samples.Enqueue(memoryDiff / (double)elapsed);
+            m_samples.Enqueue(memoryDiff / (double)elapsed);
-            }
            UpdateLastRecord(memoryNow, now);
        }
diff --git a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
index 88a0297..c41c4b9 100644
--- a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
@@ -435,21 +435,19 @@ Asset service request failures: {3}" + Environment.NewLine,
            // Get the amount of physical memory, allocated with the instance of this program, in kilobytes;
            // the working set is the set of memory pages currently visible to this program in physical RAM
            // memory and includes both shared (e.g. system libraries) and private data
-            double memUsage = Process.GetCurrentProcess().WorkingSet64 / 1024.0;
-            // Get the number of threads from the system that are currently
-            // running
            int numberThreadsRunning = 0;
-            foreach (ProcessThread currentThread in
+            double memUsage = 0;
-                Process.GetCurrentProcess().Threads)
+            using(Process p = Process.GetCurrentProcess())
            {
-                // A known issue with the current process .Threads property is
+                memUsage = p.WorkingSet64 / 1024.0;
-                // that it can return null threads, thus don't count those as
-                // running threads and prevent the program function from failing
+                // Get the number of threads from the system that are currently
-                if (currentThread != null &&
+                // running
-                    currentThread.ThreadState == ThreadState.Running)
+                
+                foreach (ProcessThread currentThread in p.Threads)
                {
-                    numberThreadsRunning++;
+                    if (currentThread != null && currentThread.ThreadState == ThreadState.Running)
+                        numberThreadsRunning++;
                }
            }
diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index 2276341..4b1a229 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -242,11 +242,7 @@ namespace OpenSim.Framework.Monitoring
        public virtual OSDMap ToBriefOSDMap()
        {
            OSDMap ret = new OSDMap();
            ret.Add("Value", OSD.FromReal(Value));
-//            double lastChangeOverTime, averageChangeOverTime;
            return ret;
        }
diff --git a/OpenSim/Framework/Monitoring/StatsLogger.cs b/OpenSim/Framework/Monitoring/StatsLogger.cs
index b719af9..e87c188 100644
--- a/OpenSim/Framework/Monitoring/StatsLogger.cs
+++ b/OpenSim/Framework/Monitoring/StatsLogger.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Monitoring
            if (cmd[2] == "start")
            {
                Start();
-                con.OutputFormat("Now recording all stats to file every {0}ms", m_statsLogIntervalMs);
+                con.Output("Now recording all stats to file every {0}ms", m_statsLogIntervalMs);
            }
            else if (cmd[2] == "stop")
            {
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Monitoring
                    sw.WriteLine(line);
            }
-            MainConsole.Instance.OutputFormat("Stats saved to file {0}", path);
+            MainConsole.Instance.Output("Stats saved to file {0}", path);
        }
        public static void Start()
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index a6b341f..05fb07a 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -117,14 +117,14 @@ namespace OpenSim.Framework.Monitoring
                    {
                        con.Output("Statistic categories available are:");
                        foreach (string category in RegisteredStats.Keys)
-                            con.OutputFormat("  {0}", category);
+                            con.Output("  {0}", category);
                    }
                    else
                    {
                        SortedDictionary<string, SortedDictionary<string, Stat>> category;
                        if (!RegisteredStats.TryGetValue(categoryName, out category))
                        {
-                            con.OutputFormat("No such category as {0}", categoryName);
+                            con.Output("No such category as {0}", categoryName);
                        }
                        else
                        {
@@ -150,14 +150,14 @@ namespace OpenSim.Framework.Monitoring
                                        }
                                        else
                                        {
-                                            con.OutputFormat(
+                                            con.Output(
                                                "No such stat {0} in {1}.{2}", statName, categoryName, containerName);
                                        }
                                    }
                                }
                                else
                                {
-                                    con.OutputFormat("No such container {0} in category {1}", containerName, categoryName);
+                                    con.Output("No such container {0} in category {1}", containerName, categoryName);
                                }
                            }
                        }
diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs
index 9cac451..ad21d93 100644
--- a/OpenSim/Framework/Monitoring/Watchdog.cs
+++ b/OpenSim/Framework/Monitoring/Watchdog.cs
@@ -197,6 +197,9 @@ namespace OpenSim.Framework.Monitoring
                foreach(ThreadWatchdogInfo twi in m_threads.Values)
                {
                    Thread t = twi.Thread;
+                    // m_log.DebugFormat(
+                    //    "[WATCHDOG]: Stop: Removing thread {0}, ID {1}", twi.Thread.Name, twi.Thread.ManagedThreadId);
                    if(t.IsAlive)
                        t.Abort();
                }
diff --git a/OpenSim/Framework/Monitoring/WorkManager.cs b/OpenSim/Framework/Monitoring/WorkManager.cs
index 5d9b185..ce639b9 100644
--- a/OpenSim/Framework/Monitoring/WorkManager.cs
+++ b/OpenSim/Framework/Monitoring/WorkManager.cs
@@ -88,6 +88,11 @@ namespace OpenSim.Framework.Monitoring
            Watchdog.Stop();
        }
+        public static Thread StartThread(ThreadStart start, string name, bool alarmIfTimeout = false, bool log = true)
+        {
+            return StartThread(start, name, ThreadPriority.Normal, true, alarmIfTimeout, null, Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS, log);
+        }
        /// <summary>
        /// Start a new long-lived thread.
        /// </summary>
@@ -99,9 +104,9 @@ namespace OpenSim.Framework.Monitoring
        /// <param name="log">If true then creation of thread is logged.</param>
        /// <returns>The newly created Thread object</returns>
        public static Thread StartThread(
-            ThreadStart start, string name, ThreadPriority priority, bool isBackground, bool alarmIfTimeout, bool log = true)
+            ThreadStart start, string name, ThreadPriority priority, bool alarmIfTimeout, bool log = true)
        {
-            return StartThread(start, name, priority, isBackground, alarmIfTimeout, null, Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS, log);
+            return StartThread(start, name, priority, true, alarmIfTimeout, null, Watchdog.DEFAULT_WATCHDOG_TIMEOUT_MS, log);
        }
        /// <summary>
@@ -162,15 +167,22 @@ namespace OpenSim.Framework.Monitoring
                {
                    Culture.SetCurrentCulture();
                    callback(obj);
-                    Watchdog.RemoveThread(log:false);
                }
                catch (Exception e)
                {
                    m_log.Error(string.Format("[WATCHDOG]: Exception in thread {0}.", name), e);
                }
+                finally
+                {
+                    try
+                    {
+                        Watchdog.RemoveThread(log: false);
+                    }
+                    catch { }
+                }
            });
-            StartThread(ts, name, ThreadPriority.Normal, true, false, log:log);
+            StartThread(ts, name, false, log:log);
        }
        /// <summary>
@@ -187,54 +199,6 @@ namespace OpenSim.Framework.Monitoring
            Util.FireAndForget(callback, obj, name, timeout);
        }
-        /// <summary>
-        /// Run a job.
-        /// </summary>
-        /// <remarks>
-        /// This differs from direct scheduling (e.g. Util.FireAndForget) in that a job can be run in the job
-        /// engine if it is running, where all jobs are currently performed in sequence on a single thread.  This is
-        /// to prevent observed overload and server freeze problems when there are hundreds of connections which all attempt to
-        /// perform work at once (e.g. in conference situations).  With lower numbers of connections, the small
-        /// delay in performing jobs in sequence rather than concurrently has not been notiecable in testing, though a future more
-        /// sophisticated implementation could perform jobs concurrently when the server is under low load.
-        ///
-        /// However, be advised that some callers of this function rely on all jobs being performed in sequence if any
-        /// jobs are performed in sequence (i.e. if jobengine is active or not).  Therefore, expanding the jobengine
-        /// beyond a single thread will require considerable thought.
-        ///
-        /// Also, any jobs submitted must be guaranteed to complete within a reasonable timeframe (e.g. they cannot
-        /// incorporate a network delay with a long timeout).  At the moment, work that could suffer such issues
-        /// should still be run directly with RunInThread(), Util.FireAndForget(), etc.  This is another area where
-        /// the job engine could be improved and so CPU utilization improved by better management of concurrency within
-        /// OpenSimulator.
-        /// </remarks>
-        /// <param name="jobType">General classification for the job (e.g. "RezAttachments").</param>
-        /// <param name="callback">Callback for job.</param>
-        /// <param name="obj">Object to pass to callback when run</param>
-        /// <param name="name">Specific name of job (e.g. "RezAttachments for Joe Bloggs"</param>
-        /// <param name="canRunInThisThread">If set to true then the job may be run in ths calling thread.</param>
-        /// <param name="mustNotTimeout">If the true then the job must never timeout.</param>
-        /// <param name="log">If set to true then extra logging is performed.</param>
-        public static void RunJob(
-            string jobType, WaitCallback callback, object obj, string name,
-            bool canRunInThisThread = false, bool mustNotTimeout = false,
-            bool log = false)
-        {
-            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)
-            {
-                Culture.SetCurrentCulture();
-                callback(obj);
-                return;
-            }
-            if (JobEngine.IsRunning)
-                JobEngine.QueueJob(name, () => callback(obj));
-            else if (canRunInThisThread)
-                callback(obj);
-            else
-                Util.FireAndForget(callback, obj, name, !mustNotTimeout);
-        }
        private static void HandleControlCommand(string module, string[] args)
        {
            //            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
@@ -251,23 +215,23 @@ namespace OpenSim.Framework.Monitoring
            if (subCommand == "stop")
            {
                JobEngine.Stop();
-                MainConsole.Instance.OutputFormat("Stopped job engine.");
+                MainConsole.Instance.Output("Stopped job engine.");
            }
            else if (subCommand == "start")
            {
                JobEngine.Start();
-                MainConsole.Instance.OutputFormat("Started job engine.");
+                MainConsole.Instance.Output("Started job engine.");
            }
            else if (subCommand == "status")
            {
-                MainConsole.Instance.OutputFormat("Job engine running: {0}", JobEngine.IsRunning);
+                MainConsole.Instance.Output("Job engine running: {0}", JobEngine.IsRunning);
                JobEngine.Job job = JobEngine.CurrentJob;
-                MainConsole.Instance.OutputFormat("Current job {0}", job != null ? job.Name : "none");
+                MainConsole.Instance.Output("Current job {0}", job != null ? job.Name : "none");
-                MainConsole.Instance.OutputFormat(
+                MainConsole.Instance.Output(
                    "Jobs waiting: {0}", JobEngine.IsRunning ? JobEngine.JobsWaiting.ToString() : "n/a");
-                MainConsole.Instance.OutputFormat("Log Level: {0}", JobEngine.LogLevel);
+                MainConsole.Instance.Output("Log Level: {0}", JobEngine.LogLevel);
            }
            else if (subCommand == "log")
            {
@@ -282,12 +246,12 @@ namespace OpenSim.Framework.Monitoring
                //                if (ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[4], out logLevel))
                //                {
                JobEngine.LogLevel = logLevel;
-                MainConsole.Instance.OutputFormat("Set debug log level to {0}", JobEngine.LogLevel);
+                MainConsole.Instance.Output("Set debug log level to {0}", JobEngine.LogLevel);
                //                }
            }
            else
            {
-                MainConsole.Instance.OutputFormat("Unrecognized job engine subcommand {0}", subCommand);
+                MainConsole.Instance.Output("Unrecognized job engine subcommand {0}", subCommand);
            }
        }
    }
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index dfe9695..d79eb0d 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -37,6 +37,8 @@ namespace OpenSim.Framework
        public bool isSandbox;
        public bool HttpUsesSSL = false;
        public string HttpSSLCN = "";
+        public string HttpSSLCertPath = "";
+        public string HttpSSLCNCertPass = "";
        public uint httpSSLPort = 9001;
        // "Out of band" managemnt https
@@ -62,6 +64,8 @@ namespace OpenSim.Framework
                (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1));
            HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
            HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
+            HttpSSLCertPath = config.Configs["Network"].GetString("http_listener_cert_path", HttpSSLCertPath);
+            HttpSSLCNCertPass = config.Configs["Network"].GetString("http_listener_cert_pass", HttpSSLCNCertPass);
            // "Out of band management https"
            ssl_listener = config.Configs["Network"].GetBoolean("https_listener",false);
diff --git a/OpenSim/Framework/PhysicsInertia.cs b/OpenSim/Framework/PhysicsInertia.cs
index fa83de8..5aae6d5 100644
--- a/OpenSim/Framework/PhysicsInertia.cs
+++ b/OpenSim/Framework/PhysicsInertia.cs
@@ -193,8 +193,6 @@ namespace OpenSim.Framework
            using(MemoryStream ms = new MemoryStream(enc.GetBytes(text)))
                using(XmlTextReader xreader = new XmlTextReader(ms))
                {
-                    xreader.ProhibitDtd = true;
                    v = new PhysicsInertiaData();
                    v.FromXml2(xreader, out error);
                }
diff --git a/OpenSim/Framework/PluginManager.cs b/OpenSim/Framework/PluginManager.cs
index 0c94fcb..794dcc9 100644
--- a/OpenSim/Framework/PluginManager.cs
+++ b/OpenSim/Framework/PluginManager.cs
@@ -129,7 +129,7 @@ namespace OpenSim.Framework
            }
            Addin addin = addins[ndx];
-            MainConsole.Instance.OutputFormat("Uninstalling plugin {0}", addin.Id);
+            MainConsole.Instance.Output("Uninstalling plugin {0}", addin.Id);
            AddinManager.Registry.DisableAddin(addin.Id);
            addin.Enabled = false;
            IProgressStatus ps = new ConsoleProgressStatus(false);
@@ -487,7 +487,7 @@ namespace OpenSim.Framework
            }
            else
            {
-                MainConsole.Instance.OutputFormat("Not Enabled in this domain {0}", addin.Name);
+                MainConsole.Instance.Output("Not Enabled in this domain {0}", addin.Name);
            }
            return;
        }
@@ -503,7 +503,7 @@ namespace OpenSim.Framework
            foreach (Addin addin in addins)
            {
-                MainConsole.Instance.OutputFormat("Addin {0}", addin.Name);
+                MainConsole.Instance.Output("Addin {0}", addin.Name);
            }
        }
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 6e7a038..a49f53c 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -133,17 +133,26 @@ namespace OpenSim.Framework
        [XmlIgnore] private float _lightCutoff;
        [XmlIgnore] private float _lightFalloff;
        [XmlIgnore] private float _lightIntensity = 1.0f;
-        [XmlIgnore] private bool _flexiEntry;
-        [XmlIgnore] private bool _lightEntry;
-        [XmlIgnore] private bool _sculptEntry;
        // Light Projection Filter
-        [XmlIgnore] private bool _projectionEntry;
        [XmlIgnore] private UUID _projectionTextureID;
        [XmlIgnore] private float _projectionFOV;
        [XmlIgnore] private float _projectionFocus;
        [XmlIgnore] private float _projectionAmb;
+        [XmlIgnore] private uint _meshFlags;
+        [XmlIgnore] private bool _flexiEntry;
+        [XmlIgnore] private bool _lightEntry;
+        [XmlIgnore] private bool _sculptEntry;
+        [XmlIgnore] private bool _projectionEntry;
+        [XmlIgnore] private bool _meshFlagsEntry;
+        public bool MeshFlagEntry
+        {
+            get { return _meshFlagsEntry;}
+        }
        public byte ProfileCurve
        {
            get { return (byte)((byte)HollowShape | (byte)ProfileShape); }
@@ -1026,117 +1035,131 @@ namespace OpenSim.Framework
        {
 //            m_log.DebugFormat("[EXTRAPARAMS]: Called ExtraParamsToBytes()");
-            ushort FlexiEP = 0x10;
+            const byte FlexiEP = 0x10;
-            ushort LightEP = 0x20;
+            const byte LightEP = 0x20;
-            ushort SculptEP = 0x30;
+            const byte SculptEP = 0x30;
-            ushort ProjectionEP = 0x40;
+            const byte ProjectionEP = 0x40;
+            //const byte MeshEP = 0x60;
+            const byte MeshFlagsEP = 0x70;
-            int i = 0;
+            int TotalBytesLength = 1; // ExtraParamsNum
-            uint TotalBytesLength = 1; // ExtraParamsNum
            uint ExtraParamsNum = 0;
            if (_flexiEntry)
            {
                ExtraParamsNum++;
-                TotalBytesLength += 16;// data
+                TotalBytesLength += 16 + 2 + 4;// data
-                TotalBytesLength += 2 + 4; // type
            }
            if (_lightEntry)
            {
                ExtraParamsNum++;
-                TotalBytesLength += 16;// data
+                TotalBytesLength += 16 + 2 + 4; // data
-                TotalBytesLength += 2 + 4; // type
            }
            if (_sculptEntry)
            {
                ExtraParamsNum++;
-                TotalBytesLength += 17;// data
+                TotalBytesLength += 17 + 2 + 4;// data
-                TotalBytesLength += 2 + 4; // type
            }
            if (_projectionEntry)
            {
                ExtraParamsNum++;
-                TotalBytesLength += 28;// data
+                TotalBytesLength += 28 + 2 + 4; // data
-                TotalBytesLength += 2 + 4;// type
+            }
+            if (_meshFlagsEntry)
+            {
+                ExtraParamsNum++;
+                TotalBytesLength += 4 + 2 + 4; // data
            }
+            byte[] returnBytes = new byte[TotalBytesLength];
-            byte[] returnbytes = new byte[TotalBytesLength];
+            returnBytes[0] = (byte)ExtraParamsNum;
-            // uint paramlength = ExtraParamsNum;
+            if(ExtraParamsNum == 0)
+                return returnBytes;
-            // Stick in the number of parameters
+            int i = 1;
-            returnbytes[i++] = (byte)ExtraParamsNum;
            if (_flexiEntry)
            {
-                byte[] FlexiData = GetFlexiBytes();
+                returnBytes[i] = FlexiEP; // 2 bytes id code
+                i += 2;
+                returnBytes[i] = 16; // 4 bytes size
+                i += 4;
-                returnbytes[i++] = (byte)(FlexiEP % 256);
+                // Softness is packed in the upper bits of tension and drag
-                returnbytes[i++] = (byte)((FlexiEP >> 8) % 256);
+                returnBytes[i] = (byte)((_flexiSoftness & 2) << 6);
+                returnBytes[i + 1] = (byte)((_flexiSoftness & 1) << 7);
-                returnbytes[i++] = (byte)(FlexiData.Length % 256);
+                returnBytes[i++] |= (byte)((byte)(_flexiTension * 10.01f) & 0x7F);
-                returnbytes[i++] = (byte)((FlexiData.Length >> 8) % 256);
+                returnBytes[i++] |= (byte)((byte)(_flexiDrag * 10.01f) & 0x7F);
-                returnbytes[i++] = (byte)((FlexiData.Length >> 16) % 256);
+                returnBytes[i++] = (byte)((_flexiGravity + 10.0f) * 10.01f);
-                returnbytes[i++] = (byte)((FlexiData.Length >> 24) % 256);
+                returnBytes[i++] = (byte)(_flexiWind * 10.01f);
-                Array.Copy(FlexiData, 0, returnbytes, i, FlexiData.Length);
+                Utils.FloatToBytes(_flexiForceX, returnBytes, i);
-                i += FlexiData.Length;
+                Utils.FloatToBytes(_flexiForceY, returnBytes, i + 4);
+                Utils.FloatToBytes(_flexiForceZ, returnBytes, i + 8);
+                i += 12;
            }
            if (_lightEntry)
            {
-                byte[] LightData = GetLightBytes();
+                returnBytes[i] = LightEP;
+                i += 2;
-                returnbytes[i++] = (byte)(LightEP % 256);
+                returnBytes[i] = 16;
-                returnbytes[i++] = (byte)((LightEP >> 8) % 256);
+                i += 4;
-                returnbytes[i++] = (byte)(LightData.Length % 256);
+                // Alpha channel in color is intensity
-                returnbytes[i++] = (byte)((LightData.Length >> 8) % 256);
+                Color4 tmpColor = new Color4(_lightColorR, _lightColorG, _lightColorB, _lightIntensity);
-                returnbytes[i++] = (byte)((LightData.Length >> 16) % 256);
+                tmpColor.GetBytes().CopyTo(returnBytes, i);
-                returnbytes[i++] = (byte)((LightData.Length >> 24) % 256);
+                Utils.FloatToBytes(_lightRadius, returnBytes, i + 4);
-                Array.Copy(LightData, 0, returnbytes, i, LightData.Length);
+                Utils.FloatToBytes(_lightCutoff, returnBytes, i + 8);
-                i += LightData.Length;
+                Utils.FloatToBytes(_lightFalloff, returnBytes, i + 12);
+                i += 16;
            }
            if (_sculptEntry)
            {
-                byte[] SculptData = GetSculptBytes();
+                //if(_sculptType == 5)
+                //    returnBytes[i] = MeshEP;
-                returnbytes[i++] = (byte)(SculptEP % 256);
+                //else
-                returnbytes[i++] = (byte)((SculptEP >> 8) % 256);
+                    returnBytes[i] = SculptEP;
+                i += 2;
+                returnBytes[i] = 17;
+                i += 4;
-                returnbytes[i++] = (byte)(SculptData.Length % 256);
+                _sculptTexture.GetBytes().CopyTo(returnBytes, i);
-                returnbytes[i++] = (byte)((SculptData.Length >> 8) % 256);
+                i += 16;
-                returnbytes[i++] = (byte)((SculptData.Length >> 16) % 256);
+                returnBytes[i++] = _sculptType;
-                returnbytes[i++] = (byte)((SculptData.Length >> 24) % 256);
-                Array.Copy(SculptData, 0, returnbytes, i, SculptData.Length);
-                i += SculptData.Length;
            }
            if (_projectionEntry)
            {
-                byte[] ProjectionData = GetProjectionBytes();
+                returnBytes[i] = ProjectionEP;
+                i += 2;
+                returnBytes[i] = 28;
+                i += 4;
-                returnbytes[i++] = (byte)(ProjectionEP % 256);
+                _projectionTextureID.GetBytes().CopyTo(returnBytes, i);
-                returnbytes[i++] = (byte)((ProjectionEP >> 8) % 256);
+                Utils.FloatToBytes(_projectionFOV, returnBytes, i + 16);
-                returnbytes[i++] = (byte)((ProjectionData.Length) % 256);
+                Utils.FloatToBytes(_projectionFocus, returnBytes, i + 20);
-                returnbytes[i++] = (byte)((ProjectionData.Length >> 16) % 256);
+                Utils.FloatToBytes(_projectionAmb, returnBytes, i + 24);
-                returnbytes[i++] = (byte)((ProjectionData.Length >> 20) % 256);
+                i += 28;
-                returnbytes[i++] = (byte)((ProjectionData.Length >> 24) % 256);
-                Array.Copy(ProjectionData, 0, returnbytes, i, ProjectionData.Length);
-                i += ProjectionData.Length;
            }
-            if (!_flexiEntry && !_lightEntry && !_sculptEntry && !_projectionEntry)
+            if (_meshFlagsEntry)
            {
-                byte[] returnbyte = new byte[1];
+                returnBytes[i] = MeshFlagsEP;
-                returnbyte[0] = 0;
+                i += 2;
-                return returnbyte;
+                returnBytes[i] = 4;
+                i += 4;
+                Utils.UIntToBytes(_meshFlags, returnBytes, i);
            }
-            return returnbytes;
+            return returnBytes;
        }
        public void ReadInUpdateExtraParam(ushort type, bool inUse, byte[] data)
@@ -1145,6 +1168,8 @@ namespace OpenSim.Framework
            const ushort LightEP = 0x20;
            const ushort SculptEP = 0x30;
            const ushort ProjectionEP = 0x40;
+            const ushort MeshEP = 0x60;
+            const ushort MeshFlagsEP = 0x70;
            switch (type)
            {
@@ -1166,6 +1191,7 @@ namespace OpenSim.Framework
                    ReadLightData(data, 0);
                    break;
+                case MeshEP:
                case SculptEP:
                    if (!inUse)
                    {
@@ -1182,115 +1208,90 @@ namespace OpenSim.Framework
                    }
                    ReadProjectionData(data, 0);
                    break;
+                case MeshFlagsEP:
+                    if (!inUse)
+                    {
+                        _meshFlagsEntry = false;
+                        return;
+                    }
+                    ReadMeshFlagsData(data, 0);
+                    break;
            }
        }
        public void ReadInExtraParamsBytes(byte[] data)
        {
-            if (data == null || data.Length == 1)
+            if (data == null)
                return;
-            const ushort FlexiEP = 0x10;
+            _flexiEntry = false;
-            const ushort LightEP = 0x20;
+            _lightEntry = false;
-            const ushort SculptEP = 0x30;
+            _sculptEntry = false;
-            const ushort ProjectionEP = 0x40;
+            _projectionEntry = false;
+            _meshFlagsEntry = false;
-            bool lGotFlexi = false;
+            if (data.Length == 1)
-            bool lGotLight = false;
+                return;
-            bool lGotSculpt = false;
-            bool lGotFilter = false;
-            int i = 0;
+            const byte FlexiEP = 0x10;
-            byte extraParamCount = 0;
+            const byte LightEP = 0x20;
-            if (data.Length > 0)
+            const byte SculptEP = 0x30;
-            {
+            const byte ProjectionEP = 0x40;
-                extraParamCount = data[i++];
+            const byte MeshEP = 0x60;
-            }
+            const byte MeshFlagsEP = 0x70;
+            byte extraParamCount = data[0];
+            int i = 1;
            for (int k = 0; k < extraParamCount; k++)
            {
-                ushort epType = Utils.BytesToUInt16(data, i);
+                byte epType = data[i];
+                i += 6;
-                i += 2;
-                // uint paramLength = Helpers.BytesToUIntBig(data, i);
-                i += 4;
                switch (epType)
                {
                    case FlexiEP:
                        ReadFlexiData(data, i);
                        i += 16;
-                        lGotFlexi = true;
                        break;
                    case LightEP:
                        ReadLightData(data, i);
                        i += 16;
-                        lGotLight = true;
                        break;
+                    case MeshEP:
                    case SculptEP:
                        ReadSculptData(data, i);
                        i += 17;
-                        lGotSculpt = true;
                        break;
                    case ProjectionEP:
                        ReadProjectionData(data, i);
                        i += 28;
-                        lGotFilter = true;
+                        break;
+                    case MeshFlagsEP:
+                        ReadMeshFlagsData(data, i);
+                        i += 4;
                        break;
                }
            }
-            if (!lGotFlexi)
-                _flexiEntry = false;
-            if (!lGotLight)
-                _lightEntry = false;
-            if (!lGotSculpt)
-                _sculptEntry = false;
-            if (!lGotFilter)
-                _projectionEntry = false;
        }
        public void ReadSculptData(byte[] data, int pos)
        {
-            UUID SculptUUID;
-            byte SculptTypel;
            if (data.Length-pos >= 17)
            {
+                _sculptTexture = new UUID(data, pos);
+                _sculptType = data[pos + 16];
                _sculptEntry = true;
-                byte[] SculptTextureUUID = new byte[16];
-                SculptTypel = data[16 + pos];
-                Array.Copy(data, pos, SculptTextureUUID,0, 16);
-                SculptUUID = new UUID(SculptTextureUUID, 0);
            }
            else
            {
                _sculptEntry = false;
-                SculptUUID = UUID.Zero;
+                _sculptTexture = UUID.Zero;
-                SculptTypel = 0x00;
+                _sculptType = 0x00;
-            }
-            if (_sculptEntry)
-            {
-                if (_sculptType != (byte)1 && _sculptType != (byte)2 && _sculptType != (byte)3 && _sculptType != (byte)4)
-                    _sculptType = 4;
            }
-            _sculptTexture = SculptUUID;
-            _sculptType = SculptTypel;
-            //m_log.Info("[SCULPT]:" + SculptUUID.ToString());
-        }
-        public byte[] GetSculptBytes()
-        {
-            byte[] data = new byte[17];
-            _sculptTexture.GetBytes().CopyTo(data, 0);
-            data[16] = (byte)_sculptType;
-            return data;
        }
        public void ReadFlexiData(byte[] data, int pos)
@@ -1304,10 +1305,9 @@ namespace OpenSim.Framework
                _flexiDrag = (float)(data[pos++] & 0x7F) / 10.0f;
                _flexiGravity = (float)(data[pos++] / 10.0f) - 10.0f;
                _flexiWind = (float)data[pos++] / 10.0f;
-                Vector3 lForce = new Vector3(data, pos);
+                _flexiForceX = Utils.BytesToFloat(data, pos);
-                _flexiForceX = lForce.X;
+                _flexiForceY = Utils.BytesToFloat(data, pos + 4);
-                _flexiForceY = lForce.Y;
+                _flexiForceZ = Utils.BytesToFloat(data, pos + 8);
-                _flexiForceZ = lForce.Z;
            }
            else
            {
@@ -1324,25 +1324,6 @@ namespace OpenSim.Framework
            }
        }
-        public byte[] GetFlexiBytes()
-        {
-            byte[] data = new byte[16];
-            int i = 0;
-            // Softness is packed in the upper bits of tension and drag
-            data[i] = (byte)((_flexiSoftness & 2) << 6);
-            data[i + 1] = (byte)((_flexiSoftness & 1) << 7);
-            data[i++] |= (byte)((byte)(_flexiTension * 10.01f) & 0x7F);
-            data[i++] |= (byte)((byte)(_flexiDrag * 10.01f) & 0x7F);
-            data[i++] = (byte)((_flexiGravity + 10.0f) * 10.01f);
-            data[i++] = (byte)(_flexiWind * 10.01f);
-            Vector3 lForce = new Vector3(_flexiForceX, _flexiForceY, _flexiForceZ);
-            lForce.GetBytes().CopyTo(data, i);
-            return data;
-        }
        public void ReadLightData(byte[] data, int pos)
        {
            if (data.Length - pos >= 16)
@@ -1373,31 +1354,12 @@ namespace OpenSim.Framework
            }
        }
-        public byte[] GetLightBytes()
-        {
-            byte[] data = new byte[16];
-            // Alpha channel in color is intensity
-            Color4 tmpColor = new Color4(_lightColorR,_lightColorG,_lightColorB,_lightIntensity);
-            tmpColor.GetBytes().CopyTo(data, 0);
-            Utils.FloatToBytes(_lightRadius).CopyTo(data, 4);
-            Utils.FloatToBytes(_lightCutoff).CopyTo(data, 8);
-            Utils.FloatToBytes(_lightFalloff).CopyTo(data, 12);
-            return data;
-        }
        public void ReadProjectionData(byte[] data, int pos)
        {
-            byte[] ProjectionTextureUUID = new byte[16];
            if (data.Length - pos >= 28)
            {
                _projectionEntry = true;
-                Array.Copy(data, pos, ProjectionTextureUUID,0, 16);
+                _projectionTextureID = new UUID(data, pos);
-                _projectionTextureID = new UUID(ProjectionTextureUUID, 0);
                _projectionFOV = Utils.BytesToFloat(data, pos + 16);
                _projectionFocus = Utils.BytesToFloat(data, pos + 20);
                _projectionAmb = Utils.BytesToFloat(data, pos + 24);
@@ -1412,19 +1374,20 @@ namespace OpenSim.Framework
            }
        }
-        public byte[] GetProjectionBytes()
+        public void ReadMeshFlagsData(byte[] data, int pos)
        {
-            byte[] data = new byte[28];
+            if (data.Length - pos >= 4)
+            {
-            _projectionTextureID.GetBytes().CopyTo(data, 0);
+                _meshFlagsEntry = true;
-            Utils.FloatToBytes(_projectionFOV).CopyTo(data, 16);
+                _meshFlags = Utils.BytesToUInt(data, pos);
-            Utils.FloatToBytes(_projectionFocus).CopyTo(data, 20);
+            }
-            Utils.FloatToBytes(_projectionAmb).CopyTo(data, 24);
+            else
+            {
-            return data;
+                _meshFlagsEntry = true;
+                _meshFlags = 0;
+            }
        }
        /// <summary>
        /// Creates a OpenMetaverse.Primitive and populates it with converted PrimitiveBaseShape values
        /// </summary>
@@ -1436,7 +1399,6 @@ namespace OpenSim.Framework
                new Quaternion(0.0f, 0.0f, 0.0f, 1.0f));
        }
        /// <summary>
        /// Creates a OpenMetaverse.Primitive and populates it with converted PrimitiveBaseShape values
        /// </summary>
@@ -1595,8 +1557,6 @@ namespace OpenSim.Framework
                    {
                        using (XmlTextReader xtr = new XmlTextReader(sr))
                        {
-                            xtr.ProhibitDtd = true;
                            xtr.MoveToContent();
                            string type = xtr.GetAttribute("type");
diff --git a/OpenSim/Framework/PriorityQueue.cs b/OpenSim/Framework/PriorityQueue.cs
index 22ffcdc..53b4f8c 100644
--- a/OpenSim/Framework/PriorityQueue.cs
+++ b/OpenSim/Framework/PriorityQueue.cs
@@ -46,12 +46,15 @@ namespace OpenSim.Framework
        /// Total number of queues (priorities) available
        /// </summary>
-        public const uint NumberOfQueues = 12; // includes immediate queues, m_queueCounts need to be set acording
+        public const uint NumberOfQueues = 13; // includes immediate queues, m_queueCounts need to be set acording
        /// <summary>
        /// Number of queuest (priorities) that are processed immediately
        /// </summary.
        public const uint NumberOfImmediateQueues = 2;
+        // first queues are immediate, so no counts
+        private static readonly uint[] m_queueCounts = {0, 0, 8, 8, 5, 4, 3, 2, 1, 1, 1, 1, 1 };
+        // this is                     ava, ava, attach, <10m, 20,40,80,160m,320,640,1280, +
        private MinHeap<MinHeapItem>[] m_heaps = new MinHeap<MinHeapItem>[NumberOfQueues];
        private Dictionary<uint, LookupItem> m_lookupTable;
@@ -61,10 +64,8 @@ namespace OpenSim.Framework
        // each pass. weighted towards the higher priority queues
        private uint m_nextQueue = 0;
        private uint m_countFromQueue = 0;
-        // first queues are imediate, so no counts
+        private int m_capacity;
-//        private uint[] m_queueCounts = { 0, 0,          8,  4,  4, 2,  2,   2,  2,  1,  1, 1 };
+        private int m_added;
-        private uint[] m_queueCounts = {0,   0,   8,      8,  5,  4, 3,  2,   1,  1,  1,  1};
-        // this is                     ava, ava, attach, <10m, 20,40,80,160m,320,640,1280, +
        // next request is a counter of the number of updates queued, it provides
        // a total ordering on the updates coming through the queue and is more
@@ -84,17 +85,29 @@ namespace OpenSim.Framework
        public PriorityQueue(int capacity)
        {
-            m_lookupTable = new Dictionary<uint, LookupItem>(capacity);
+            m_capacity = 16;
+            capacity /= 4;
            for (int i = 0; i < m_heaps.Length; ++i)
                m_heaps[i] = new MinHeap<MinHeapItem>(capacity);
+            m_lookupTable = new Dictionary<uint, LookupItem>(m_capacity);
            m_nextQueue = NumberOfImmediateQueues;
            m_countFromQueue = m_queueCounts[m_nextQueue];
+            m_added = 0;
        }
 #endregion Constructor
 #region PublicMethods
+        public void Close()
+        {
+            for (int i = 0; i < m_heaps.Length; ++i)
+                m_heaps[i] = null;
+            m_heaps = null;
+            m_lookupTable.Clear();
+            m_lookupTable = null;
+        }
        /// <summary>
        /// Return the number of items in the queues
        /// </summary>
@@ -116,16 +129,33 @@ namespace OpenSim.Framework
        public bool Enqueue(uint pqueue, EntityUpdate value)
        {
            LookupItem lookup;
+            IHandle lookupH; 
+            UInt64 entry;
            uint localid = value.Entity.LocalId;
-            UInt64 entry = m_nextRequest++;
            if (m_lookupTable.TryGetValue(localid, out lookup))
            {
-                entry = lookup.Heap[lookup.Handle].EntryOrder;
+                lookupH = lookup.Handle;
-                value.Update(lookup.Heap[lookup.Handle].Value);
+                entry = lookup.Heap[lookupH].EntryOrder;
-                lookup.Heap.Remove(lookup.Handle);
+                EntityUpdate up = lookup.Heap[lookupH].Value;
+                value.Update(lookup.Heap[lookupH].Value);
+                lookup.Heap.Remove(lookupH);
+                if((up.Flags & PrimUpdateFlags.CancelKill) != 0)
+                    entry = m_nextRequest++;
+                pqueue = Util.Clamp<uint>(pqueue, 0, NumberOfQueues - 1);
+                lookup.Heap = m_heaps[pqueue];
+                lookup.Heap.Add(new MinHeapItem(pqueue, entry, value), ref lookup.Handle);
+                m_lookupTable[localid] = lookup;
+                return true;
            }
+            value.Update();
+            entry = m_nextRequest++;
+            ++m_added;
            pqueue = Util.Clamp<uint>(pqueue, 0, NumberOfQueues - 1);
            lookup.Heap = m_heaps[pqueue];
            lookup.Heap.Add(new MinHeapItem(pqueue, entry, value), ref lookup.Handle);
@@ -134,7 +164,6 @@ namespace OpenSim.Framework
            return true;
        }
        public void Remove(List<uint> ids)
        {
            LookupItem lookup;
@@ -147,6 +176,11 @@ namespace OpenSim.Framework
                    m_lookupTable.Remove(localid);
                }
            }
+            if(m_lookupTable.Count == 0 && m_added > 8 * m_capacity)
+            {
+                m_lookupTable = new Dictionary<uint, LookupItem>(m_capacity);
+                m_added = 0;
+            }
        }
        /// <summary>
@@ -154,17 +188,17 @@ namespace OpenSim.Framework
        /// oldest item from the next queue in order to provide fair access to
        /// all of the queues
        /// </summary>
-        public bool TryDequeue(out EntityUpdate value, out Int32 timeinqueue)
+        public bool TryDequeue(out EntityUpdate value)
        {
-            // If there is anything in imediate queues, return it first no
+            // If there is anything in immediate queues, return it first no
            // matter what else. Breaks fairness. But very useful.
+            
            for (int iq = 0; iq < NumberOfImmediateQueues; iq++)
            {
                if (m_heaps[iq].Count > 0)
                {
                    MinHeapItem item = m_heaps[iq].RemoveMin();
                    m_lookupTable.Remove(item.Value.Entity.LocalId);
-                    timeinqueue = Util.EnvironmentTickCountSubtract(item.EntryTime);
                    value = item.Value;
                    return true;
@@ -177,16 +211,15 @@ namespace OpenSim.Framework
            // to give lower numbered queues a higher priority and higher percentage
            // of the bandwidth.
+            MinHeap<MinHeapItem> curheap = m_heaps[m_nextQueue];
            // Check for more items to be pulled from the current queue
-            if (m_heaps[m_nextQueue].Count > 0 && m_countFromQueue > 0)
+            if (m_countFromQueue > 0 && curheap.Count > 0)
            {
-                m_countFromQueue--;
+                --m_countFromQueue;
-                MinHeapItem item = m_heaps[m_nextQueue].RemoveMin();
+                MinHeapItem item = curheap.RemoveMin();
                m_lookupTable.Remove(item.Value.Entity.LocalId);
-                timeinqueue = Util.EnvironmentTickCountSubtract(item.EntryTime);
                value = item.Value;
                return true;
            }
@@ -196,44 +229,49 @@ namespace OpenSim.Framework
                m_nextQueue++;
                if(m_nextQueue >= NumberOfQueues)
                    m_nextQueue = NumberOfImmediateQueues;
+ 
+                curheap = m_heaps[m_nextQueue];
+                if (curheap.Count == 0)
+                    continue;
                m_countFromQueue = m_queueCounts[m_nextQueue];
+                --m_countFromQueue;
-                if (m_heaps[m_nextQueue].Count > 0)
+                MinHeapItem item = curheap.RemoveMin();
-                {
+                m_lookupTable.Remove(item.Value.Entity.LocalId);
-                    m_countFromQueue--;
+                value = item.Value;
+                return true;
-                    MinHeapItem item = m_heaps[m_nextQueue].RemoveMin();
-                    m_lookupTable.Remove(item.Value.Entity.LocalId);
-                    timeinqueue = Util.EnvironmentTickCountSubtract(item.EntryTime);
-                    value = item.Value;
-                    return true;
-                }
            }
-            timeinqueue = 0;
            value = default(EntityUpdate);
+            if(m_lookupTable.Count == 0 && m_added > 8 * m_capacity)
+            {
+                m_lookupTable = new Dictionary<uint, LookupItem>(m_capacity);
+                m_added = 0;
+            }
            return false;
        }
-        public bool TryOrderedDequeue(out EntityUpdate value, out Int32 timeinqueue)
+        public bool TryOrderedDequeue(out EntityUpdate value)
        {
-            // If there is anything in imediate queues, return it first no
+            for (int iq = 0; iq < NumberOfQueues; ++iq)
-            // matter what else. Breaks fairness. But very useful.
-            for (int iq = 0; iq < NumberOfQueues; iq++)
            {
-                if (m_heaps[iq].Count > 0)
+                MinHeap<MinHeapItem> curheap = m_heaps[iq];
+                if (curheap.Count > 0)
                {
-                    MinHeapItem item = m_heaps[iq].RemoveMin();
+                    MinHeapItem item = curheap.RemoveMin();
                    m_lookupTable.Remove(item.Value.Entity.LocalId);
-                    timeinqueue = Util.EnvironmentTickCountSubtract(item.EntryTime);
                    value = item.Value;
                    return true;
                }
            }
-            timeinqueue = 0;
            value = default(EntityUpdate);
+            if(m_lookupTable.Count == 0 && m_added > 8 * m_capacity)
+            {
+                m_lookupTable = new Dictionary<uint, LookupItem>(m_capacity);
+                m_added = 0;
+            }
            return false;
        }
@@ -244,13 +282,11 @@ namespace OpenSim.Framework
        public void Reprioritize(UpdatePriorityHandler handler)
        {
            MinHeapItem item;
-            foreach (LookupItem lookup in new List<LookupItem>(this.m_lookupTable.Values))
+            uint pqueue = 0;
+            foreach (LookupItem lookup in new List<LookupItem>(m_lookupTable.Values))
            {
                if (lookup.Heap.TryGetValue(lookup.Handle, out item))
                {
-                    uint pqueue = item.PriorityQueue;
-                    uint localid = item.Value.Entity.LocalId;
                    if (handler(ref pqueue, item.Value.Entity))
                    {
                        // unless the priority queue has changed, there is no need to modify
@@ -263,14 +299,14 @@ namespace OpenSim.Framework
                            LookupItem litem = lookup;
                            litem.Heap = m_heaps[pqueue];
                            litem.Heap.Add(new MinHeapItem(pqueue, item), ref litem.Handle);
-                            m_lookupTable[localid] = litem;
+                            m_lookupTable[item.Value.Entity.LocalId] = litem;
                        }
                    }
                    else
                    {
                        // m_log.WarnFormat("[PQUEUE]: UpdatePriorityHandler returned false for {0}",item.Value.Entity.UUID);
                        lookup.Heap.Remove(lookup.Handle);
-                        this.m_lookupTable.Remove(localid);
+                        m_lookupTable.Remove(item.Value.Entity.LocalId);
                    }
                }
            }
@@ -282,7 +318,7 @@ namespace OpenSim.Framework
        {
            string s = "";
            for (int i = 0; i < NumberOfQueues; i++)
-                s += String.Format("{0,7} ",m_heaps[i].Count);
+                s += String.Format("{0,7} ", m_heaps[i].Count);
            return s;
        }
@@ -292,48 +328,44 @@ namespace OpenSim.Framework
        private struct MinHeapItem : IComparable<MinHeapItem>
        {
            private EntityUpdate value;
-            internal EntityUpdate Value {
+            internal EntityUpdate Value
-                get {
+            {
-                    return this.value;
+                get
+                {
+                    return value;
                }
            }
            private uint pqueue;
-            internal uint PriorityQueue {
+            internal uint PriorityQueue
-                get {
+            {
-                    return this.pqueue;
+                get
-                }
+                {
-            }
+                    return pqueue;
-            private Int32 entrytime;
-            internal Int32 EntryTime {
-                get {
-                    return this.entrytime;
                }
            }
            private UInt64 entryorder;
            internal UInt64 EntryOrder
            {
-                get {
+                get
-                    return this.entryorder;
+                {
+                    return entryorder;
                }
            }
-            internal MinHeapItem(uint pqueue, MinHeapItem other)
+            internal MinHeapItem(uint _pqueue, MinHeapItem other)
            {
-                this.entrytime = other.entrytime;
+                entryorder = other.entryorder;
-                this.entryorder = other.entryorder;
+                value = other.value;
-                this.value = other.value;
+                pqueue = _pqueue;
-                this.pqueue = pqueue;
            }
-            internal MinHeapItem(uint pqueue, UInt64 entryorder, EntityUpdate value)
+            internal MinHeapItem(uint _pqueue, UInt64 _entryorder, EntityUpdate _value)
            {
-                this.entrytime = Util.EnvironmentTickCount();
+                entryorder = _entryorder;
-                this.entryorder = entryorder;
+                value = _value;
-                this.value = value;
+                pqueue = _pqueue;
-                this.pqueue = pqueue;
            }
            public override string ToString()
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 9e5162e..df0b8da 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -180,6 +180,7 @@ namespace OpenSim.Framework
        private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>();
+        public UUID CacheID { get; set;}
        // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
        // MT: Yes. Estates can't span trust boundaries. Therefore, it can be
@@ -196,7 +197,7 @@ namespace OpenSim.Framework
        public RegionInfo(string description, string filename, bool skipConsoleConfig, IConfigSource configSource, string configName)
        {
            // m_configSource = configSource;
+            CacheID = UUID.Random();
            if (string.Empty == filename)
            {
                ReadNiniConfig(configSource, "Region", configName);
@@ -261,6 +262,7 @@ namespace OpenSim.Framework
            ReadNiniConfig(source, name);
            m_serverURI = string.Empty;
+            CacheID = UUID.Random();
        }
        public RegionInfo(uint legacyRegionLocX, uint legacyRegionLocY, IPEndPoint internalEndPoint, string externalUri)
@@ -272,11 +274,13 @@ namespace OpenSim.Framework
            m_internalEndPoint = internalEndPoint;
            m_externalHostName = externalUri;
            m_serverURI = string.Empty;
+            CacheID = UUID.Random();
        }
        public RegionInfo()
        {
            m_serverURI = string.Empty;
+            CacheID = UUID.Random();
        }
        public EstateSettings EstateSettings
@@ -533,7 +537,7 @@ namespace OpenSim.Framework
                {
                    while (name.Trim() == string.Empty)
                    {
-                        name = MainConsole.Instance.CmdPrompt("New region name", name);
+                        name = MainConsole.Instance.Prompt("New region name", name);
                        if (name.Trim() == string.Empty)
                        {
                            MainConsole.Instance.Output("Cannot interactively create region with no name");
@@ -579,7 +583,7 @@ namespace OpenSim.Framework
                UUID newID = UUID.Random();
                while (RegionID == UUID.Zero)
                {
-                    regionUUID = MainConsole.Instance.CmdPrompt("RegionUUID", newID.ToString());
+                    regionUUID = MainConsole.Instance.Prompt("RegionUUID", newID.ToString());
                    if (!UUID.TryParse(regionUUID.Trim(), out RegionID))
                    {
                        MainConsole.Instance.Output("RegionUUID must be a valid UUID");
@@ -596,7 +600,7 @@ namespace OpenSim.Framework
            string location = config.GetString("Location", String.Empty);
            if (location == String.Empty)
            {
-                location = MainConsole.Instance.CmdPrompt("Region Location", "1000,1000");
+                location = MainConsole.Instance.Prompt("Region Location", "1000,1000");
                config.Set("Location", location);
            }
@@ -632,7 +636,7 @@ namespace OpenSim.Framework
            }
            else
            {
-                address = IPAddress.Parse(MainConsole.Instance.CmdPrompt("Internal IP address", "0.0.0.0"));
+                address = IPAddress.Parse(MainConsole.Instance.Prompt("Internal IP address", "0.0.0.0"));
                config.Set("InternalAddress", address.ToString());
            }
@@ -646,7 +650,7 @@ namespace OpenSim.Framework
            }
            else
            {
-                port = Convert.ToInt32(MainConsole.Instance.CmdPrompt("Internal port", "9000"));
+                port = Convert.ToInt32(MainConsole.Instance.Prompt("Internal port", "9000"));
                config.Set("InternalPort", port);
            }
            m_internalEndPoint = new IPEndPoint(address, port);
@@ -661,7 +665,7 @@ namespace OpenSim.Framework
            else
            {
                if (creatingNew)
-                    m_resolveAddress = Convert.ToBoolean(MainConsole.Instance.CmdPrompt("Resolve hostname to IP on start (for running inside Docker)", "False"));
+                    m_resolveAddress = Convert.ToBoolean(MainConsole.Instance.Prompt("Resolve hostname to IP on start (for running inside Docker)", "False"));
                config.Set("ResolveAddress", m_resolveAddress.ToString());
            }
@@ -676,7 +680,7 @@ namespace OpenSim.Framework
            }
            else
            {
-                externalName = MainConsole.Instance.CmdPrompt("External host name", "SYSTEMIP");
+                externalName = MainConsole.Instance.Prompt("External host name", "SYSTEMIP");
                config.Set("ExternalHostName", externalName);
            }
            if (externalName == "SYSTEMIP")
diff --git a/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs b/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
index f274da2..1b828ca 100644
--- a/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
+++ b/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework
    {
        public float billableFactor;
        public uint estateID;
-        public byte maxAgents;
+        public int maxAgents;
        public float objectBonusFactor;
        public uint parentEstateID;
        public int pricePerMeter;
@@ -48,5 +48,7 @@ namespace OpenSim.Framework
        public float waterHeight;
        public string simName;
        public string regionType;
+        public int AgentCapacity;
+        public int ObjectsCapacity;
    }
 }
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index af130a5..238ebb1 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Serialization.External
                return xml;
            XmlDocument doc = new XmlDocument();
-            doc.XmlResolver=null;
            doc.LoadXml(xml);
            XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart");
@@ -221,7 +221,7 @@ namespace OpenSim.Framework.Serialization.External
            using (StringWriter sw = new StringWriter())
            using (XmlTextWriter writer = new XmlTextWriter(sw))
            using (XmlTextReader wrappedReader = new XmlTextReader(xmlData, XmlNodeType.Element, null))
-            using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true}))
+            using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment}))
            {
                TransformXml(reader, writer, sceneName, homeURL, userService, scopeID);
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
index 33ffd83..e42d56f 100644
--- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -178,7 +178,6 @@ namespace OpenSim.Framework.Serialization.External
            using (XmlTextReader reader = new XmlTextReader(new StringReader(serializedLandData)))
            {
-                reader.ProhibitDtd = true;
                reader.ReadStartElement("LandData");
                ExternalRepresentationUtils.ExecuteReadProcessors<LandData>(landData, m_ldProcessors, reader);
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index fd21f3e..617c451 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -63,7 +63,6 @@ namespace OpenSim.Framework.Serialization.External
            StringReader sr = new StringReader(serializedSettings);
            XmlTextReader xtr = new XmlTextReader(sr);
-            xtr.ProhibitDtd = true;
            xtr.ReadStartElement("RegionSettings");
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index 12194ad..9b02553 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -202,8 +202,6 @@ namespace OpenSim.Framework.Serialization.External
            using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization)))
            {
-                reader.ProhibitDtd = true;
                reader.ReadStartElement("InventoryItem");
                ExternalRepresentationUtils.ExecuteReadProcessors<InventoryItemBase>(
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 81dd357..c09e53d 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -33,6 +33,9 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Timers;
+using System.Net;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
 using log4net;
 using log4net.Appender;
 using log4net.Core;
@@ -86,6 +89,26 @@ namespace OpenSim.Framework.Servers
            m_osSecret = UUID.Random().ToString();
        }
+        private static bool m_NoVerifyCertChain = false;
+        private static bool m_NoVerifyCertHostname = false;
+        public static bool ValidateServerCertificate(
+            object sender,
+            X509Certificate certificate,
+            X509Chain chain,
+            SslPolicyErrors sslPolicyErrors)
+        {
+            if (m_NoVerifyCertChain)
+                sslPolicyErrors &= ~SslPolicyErrors.RemoteCertificateChainErrors;
+ 
+            if (m_NoVerifyCertHostname)
+                sslPolicyErrors &= ~SslPolicyErrors.RemoteCertificateNameMismatch;
+            if (sslPolicyErrors == SslPolicyErrors.None)
+                return true;
+            return false;
+        }             
        /// <summary>
        /// Must be overriden by child classes for their own server specific startup behaviour.
        /// </summary>
@@ -96,6 +119,11 @@ namespace OpenSim.Framework.Servers
            RegisterCommonComponents(Config);
            IConfig startupConfig = Config.Configs["Startup"];
+            m_NoVerifyCertChain = startupConfig.GetBoolean("NoVerifyCertChain", m_NoVerifyCertChain);
+            m_NoVerifyCertHostname = startupConfig.GetBoolean("NoVerifyCertHostname", m_NoVerifyCertHostname);
+            ServicePointManager.ServerCertificateValidationCallback = ValidateServerCertificate;
            int logShowStatsSeconds = startupConfig.GetInt("LogShowStatsSeconds", m_periodDiagnosticTimerMS / 1000);
            m_periodDiagnosticTimerMS = logShowStatsSeconds * 1000;
            m_periodicDiagnosticsTimer.Elapsed += new ElapsedEventHandler(LogDiagnostics);
@@ -113,11 +141,10 @@ namespace OpenSim.Framework.Servers
            
            MainServer.Stop();
-            Thread.Sleep(5000);
+            Thread.Sleep(500);
            Util.StopThreadPool();
            WorkManager.Stop();
-            Thread.Sleep(1000);
            RemovePIDFile();
            m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 26694b5..d7cffb9 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -32,6 +32,7 @@ using System.Collections.Specialized;
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
+using System.Net.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Reflection;
 using System.Globalization;
@@ -43,10 +44,11 @@ using log4net;
 using Nwc.XmlRpc;
 using OpenMetaverse.StructuredData;
 using CoolHTTPListener = HttpServer.HttpListener;
-using HttpListener=System.Net.HttpListener;
+using LogPrio = HttpServer.LogPrio;
-using LogPrio=HttpServer.LogPrio;
 using OpenSim.Framework.Monitoring;
 using System.IO.Compression;
+using System.Security.Cryptography;
+using OpenSim.Framework.Servers;
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -55,6 +57,8 @@ namespace OpenSim.Framework.Servers.HttpServer
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private HttpServerLogWriter httpserverlog = new HttpServerLogWriter();
        private static Encoding UTF8NoBOM = new System.Text.UTF8Encoding(false);
+        public static PollServiceRequestManager m_pollServiceManager;
+        private static object m_generalLock = new object();
        /// <summary>
        /// This is a pending websocket request before it got an sucessful upgrade response.
@@ -107,19 +111,25 @@ namespace OpenSim.Framework.Servers.HttpServer
            new Dictionary<string, WebSocketRequestDelegate>();
        protected uint m_port;
-        protected uint m_sslport;
        protected bool m_ssl;
        private X509Certificate2 m_cert;
-        protected bool m_firstcaps = true;
        protected string m_SSLCommonName = "";
+        protected List<string> m_certNames = new List<string>();
+        protected List<string> m_certIPs = new List<string>();
+        protected string m_certCN= "";
+        protected RemoteCertificateValidationCallback m_certificateValidationCallback = null;
        protected IPAddress m_listenIPAddress = IPAddress.Any;
-        public PollServiceRequestManager PollServiceRequestManager { get; private set; }
+        public string Protocol
+        {
+            get { return m_ssl ? "https://" : "http://"; }
+        }
        public uint SSLPort
        {
-            get { return m_sslport; }
+            get { return m_port; }
        }
        public string SSLCommonName
@@ -148,27 +158,166 @@ namespace OpenSim.Framework.Servers.HttpServer
            m_port = port;
        }
-        public BaseHttpServer(uint port, bool ssl) : this (port)
+        private void load_cert(string CPath, string CPass)
        {
-            m_ssl = ssl;
+            try
+            {
+                 m_cert = new X509Certificate2(CPath, CPass);
+                X509Extension ext = m_cert.Extensions["2.5.29.17"];
+                if(ext != null)
+                {
+                    AsnEncodedData asndata = new AsnEncodedData(ext.Oid, ext.RawData);
+                    string datastr = asndata.Format(true);
+                    string[] lines = datastr.Split(new char[] {'\n','\r'});
+                    foreach(string s in lines)
+                    {
+                        if(String.IsNullOrEmpty(s))
+                            continue;
+                        string[] parts = s.Split(new char[] {'='});
+                        if(String.IsNullOrEmpty(parts[0]))
+                            continue;
+                        string entryName = parts[0].Replace(" ","");
+                        if(entryName == "DNSName")
+                            m_certNames.Add(parts[1]);
+                        else if(entryName == "IPAddress")
+                            m_certIPs.Add(parts[1]);
+                        else if(entryName == "Unknown(135)") // stupid mono
+                        {
+                            try
+                            {
+                                if(parts[1].Length == 8)
+                                {
+                                    long tmp = long.Parse(parts[1], NumberStyles.AllowHexSpecifier);
+                                    tmp = IPAddress.HostToNetworkOrder(tmp);
+                                    tmp = (long)((ulong) tmp >> 32);
+                                    IPAddress ia = new IPAddress(tmp);     
+                                    m_certIPs.Add(ia.ToString());
+                                }
+                            }
+                            catch {}
+                        }
+                    }
+                }
+                m_certCN = m_cert.GetNameInfo(X509NameType.SimpleName, false);
+            }
+            catch
+            {
+                throw new Exception("SSL cert load error");
+            }
        }
-        public BaseHttpServer(uint port, bool ssl, uint sslport, string CN) : this (port, ssl)
+        public BaseHttpServer(uint port, bool ssl, string CN, string CPath, string CPass)
        {
-            if (m_ssl)
+            m_port = port;
+            if (ssl)
            {
-                m_sslport = sslport;
+                if(string.IsNullOrEmpty(CPath))
+                    throw new Exception("invalid main http server cert path");
+                if(Uri.CheckHostName(CN) == UriHostNameType.Unknown)
+                    throw new Exception("invalid main http server CN (ExternalHostName)");
+                m_certNames.Clear();
+                m_certIPs.Clear();
+                m_certCN= "";
+                m_ssl = true;
+                load_cert(CPath, CPass);
+                
+                if(!CheckSSLCertHost(CN))
+                    throw new Exception("invalid main http server CN (ExternalHostName)");
+                m_SSLCommonName = CN;
+                if(m_cert.Issuer == m_cert.Subject )
+                    m_log.Warn("Self signed certificate. Clients need to allow this (some viewers debug option NoVerifySSLcert must be set to true");
            }
+            else
+                m_ssl = false;
        }
-        public BaseHttpServer(uint port, bool ssl, string CPath, string CPass) : this (port, ssl)
+        public BaseHttpServer(uint port, bool ssl, string CPath, string CPass)
        {
-            if (m_ssl)
+            m_port = port;
+            if (ssl)
            {
-                m_cert = new X509Certificate2(CPath, CPass);
+                load_cert(CPath, CPass);
+                if(m_cert.Issuer == m_cert.Subject )
+                    m_log.Warn("Self signed certificate. Http clients need to allow this");
+                m_ssl = true;
            }
+            else
+                m_ssl = false;
+        }
+        static bool MatchDNS(string hostname, string dns)
+        {
+            int indx = dns.IndexOf('*');
+            if (indx == -1)
+                return (String.Compare(hostname, dns, true, CultureInfo.InvariantCulture) == 0);
+            int dnslen = dns.Length;
+            dnslen--;
+            if (indx == dnslen)
+                return true; // just * ?
+            if (indx > dnslen - 2)
+                return false; // 2 short ?
+            if (dns[indx + 1] != '.')
+                return false;
+            int indx2 = dns.IndexOf('*', indx + 1);
+            if (indx2 != -1)
+                return false; // there can only be one;
+            string end = dns.Substring(indx + 1);
+            int hostlen = hostname.Length;
+            int endlen = end.Length;
+            int length = hostlen - endlen;
+            if (length <= 0)
+                return false;
+            if (String.Compare(hostname, length, end, 0, endlen, true, CultureInfo.InvariantCulture) != 0)
+                return false;
+            if (indx == 0)
+            {
+                indx2 = hostname.IndexOf('.');
+                return ((indx2 == -1) || (indx2 >= length));
+            }
+            string start = dns.Substring(0, indx);
+            return (String.Compare(hostname, 0, start, 0, start.Length, true, CultureInfo.InvariantCulture) == 0);
        }
+        public bool CheckSSLCertHost(string hostname)
+        {
+            UriHostNameType htype = Uri.CheckHostName(hostname);
+            if(htype == UriHostNameType.Unknown || htype == UriHostNameType.Basic)
+                return false;
+            if(htype == UriHostNameType.Dns)
+            {
+                foreach(string name in m_certNames)
+                {
+                    if(MatchDNS(hostname, name))
+                        return true;
+                }
+                if(MatchDNS(hostname, m_certCN))
+                    return true;
+            }
+            else
+            {
+                foreach(string ip in m_certIPs)
+                {
+                    if (String.Compare(hostname, ip, true, CultureInfo.InvariantCulture) == 0)
+                        return true;
+                }               
+            }
+            return false;
+        }
        /// <summary>
        /// Add a stream handler to the http server.  If the handler already exists, then nothing happens.
        /// </summary>
@@ -379,7 +528,6 @@ namespace OpenSim.Framework.Servers.HttpServer
        public void OnRequest(object source, RequestEventArgs args)
        {
            RequestNumber++;
            try
            {
                IHttpClientContext context = (IHttpClientContext)source;
@@ -396,12 +544,9 @@ namespace OpenSim.Framework.Servers.HttpServer
                    if (psEvArgs.Request != null)
                    {
                        OSHttpRequest req = new OSHttpRequest(context, request);
-                        Stream requestStream = req.InputStream;
                        string requestBody;
                        Encoding encoding = Encoding.UTF8;
-                        using(StreamReader reader = new StreamReader(requestStream, encoding))
+                        using(StreamReader reader = new StreamReader(req.InputStream, encoding))
                            requestBody = reader.ReadToEnd();
                        Hashtable keysvals = new Hashtable();
@@ -431,7 +576,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                        psEvArgs.Request(psreq.RequestID, keysvals);
                    }
-                    PollServiceRequestManager.Enqueue(psreq);
+                    m_pollServiceManager.Enqueue(psreq);
                }
                else
                {
@@ -459,9 +604,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                return;
            }
-            OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
+            OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request));
-            resp.ReuseContext = true;
-//            resp.ReuseContext = false;
            HandleRequest(req, resp);
            // !!!HACK ALERT!!!
@@ -472,16 +616,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                    request.AcceptTypes[i] = string.Empty;
        }
-        // public void ConvertIHttpClientContextToOSHttp(object stateinfo)
-        // {
-        //     HttpServerContextObj objstate = (HttpServerContextObj)stateinfo;
-        //     OSHttpRequest request = objstate.oreq;
-        //     OSHttpResponse resp = objstate.oresp;
-        //     HandleRequest(request,resp);
-        // }
        /// <summary>
        /// This methods is the start of incoming HTTP request handling.
        /// </summary>
@@ -493,6 +627,8 @@ namespace OpenSim.Framework.Servers.HttpServer
            {
                try
                {
+                    if(request.InputStream != null && request.InputStream.CanRead) 
+                        request.InputStream.Close();
                    byte[] buffer500 = SendHTML500(response);
                    response.OutputStream.Write(buffer500, 0, buffer500.Length);
                    response.Send();
@@ -540,9 +676,6 @@ namespace OpenSim.Framework.Servers.HttpServer
 //                    }
 //                }
-                //response.KeepAlive = true;
-                response.SendChunked = false;
                string path = request.RawUrl;
                string handlerKey = GetHandlerKey(request.HttpMethod, path);
                byte[] buffer = null;
@@ -564,11 +697,10 @@ namespace OpenSim.Framework.Servers.HttpServer
                    {
                        //m_log.Debug("[BASE HTTP SERVER]: Found Caps based HTTP Handler");
                        IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler;
-                        Stream requestStream = request.InputStream;
                        string requestBody;
                        Encoding encoding = Encoding.UTF8;
-                        using(StreamReader reader = new StreamReader(requestStream, encoding))
+                        using(StreamReader reader = new StreamReader(request.InputStream, encoding))
                            requestBody = reader.ReadToEnd();
                        Hashtable keysvals = new Hashtable();
@@ -609,11 +741,9 @@ namespace OpenSim.Framework.Servers.HttpServer
                    else
                    {
                        IStreamHandler streamHandler = (IStreamHandler)requestHandler;
                        using (MemoryStream memoryStream = new MemoryStream())
                        {
                            streamHandler.Handle(path, request.InputStream, memoryStream, request, response);
-                            memoryStream.Flush();
                            buffer = memoryStream.ToArray();
                        }
                    }
@@ -686,7 +816,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    }
                }
-                if(request.InputStream.CanRead)
+                if(request.InputStream != null && request.InputStream.CanRead)
                    request.InputStream.Dispose();
                if (buffer != null)
@@ -711,7 +841,10 @@ namespace OpenSim.Framework.Servers.HttpServer
                    if (!response.SendChunked && response.ContentLength64 <= 0)
                        response.ContentLength64 = buffer.LongLength;
-                    response.OutputStream.Write(buffer, 0, buffer.Length);
+                    //response.OutputStream.Write(buffer, 0, buffer.Length);
+                    response.RawBufferStart = 0;
+                    response.RawBufferLen = buffer.Length;
+                    response.RawBuffer = buffer;
                }
                // Do not include the time taken to actually send the response to the caller in the measurement
@@ -719,11 +852,9 @@ namespace OpenSim.Framework.Servers.HttpServer
                // server
                requestEndTick = Environment.TickCount;
+                buffer = null;
                response.Send();
+                response.RawBuffer = null;
-                //response.OutputStream.Close();
-                //response.FreeContext();
            }
            catch (SocketException e)
            {
@@ -755,6 +886,9 @@ namespace OpenSim.Framework.Servers.HttpServer
            }
            finally
            {
+                if(request.InputStream != null && request.InputStream.CanRead)
+                    request.InputStream.Close();
                // Every month or so this will wrap and give bad numbers, not really a problem
                // since its just for reporting
                int tickdiff = requestEndTick - requestStartTick;
@@ -1008,12 +1142,13 @@ namespace OpenSim.Framework.Servers.HttpServer
                using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8))
                    requestBody = reader.ReadToEnd();
-            }
+                }
            finally
            {
-                if (innerStream != null)
+                if (innerStream != null && innerStream.CanRead)
                    innerStream.Dispose();
-                requestStream.Dispose();
+                if (requestStream.CanRead)
+                    requestStream.Dispose();
            }
            //m_log.Debug(requestBody);
@@ -1094,6 +1229,17 @@ namespace OpenSim.Framework.Servers.HttpServer
                        if (gridproxy)
                            xmlRprcRequest.Params.Add("gridproxy");  // Param[4]
+                        // reserve this for
+                        // ... by Fumi.Iseki for DTLNSLMoneyServer
+                        // BUT make its presence possible to detect/parse
+                        string rcn = request.IHttpClientContext.SSLCommonName;
+                        if(!string.IsNullOrWhiteSpace(rcn))
+                        {
+                            rcn = "SSLCN:" + rcn;
+                            xmlRprcRequest.Params.Add(rcn); // Param[4] or Param[5]
+                        }
+                
                        try
                        {
                            xmlRpcResponse = method(xmlRprcRequest, request.RemoteIPEndPoint);
@@ -1116,6 +1262,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                        // if the method wasn't found, we can't determine KeepAlive state anyway, so lets do it only here
                        response.KeepAlive = keepAlive;
+                        response.AddHeader("Access-Control-Allow-Origin", "*");
                    }
                    else
                    {
@@ -1160,7 +1307,6 @@ namespace OpenSim.Framework.Servers.HttpServer
            byte[] buffer = Encoding.UTF8.GetBytes(responseString);
-            response.SendChunked = false;
            response.ContentLength64 = buffer.Length;
            response.ContentEncoding = Encoding.UTF8;
@@ -1245,7 +1391,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                }
            }
-            response.KeepAlive = true;
            string responseData = string.Empty;
            responseData = jsonRpcResponse.Serialize();
@@ -1257,6 +1402,8 @@ namespace OpenSim.Framework.Servers.HttpServer
        private byte[] HandleLLSDRequests(OSHttpRequest request, OSHttpResponse response)
        {
            //m_log.Warn("[BASE HTTP SERVER]: We've figured out it's a LLSD Request");
+            bool notfound = false;
            Stream requestStream = request.InputStream;
            string requestBody;
@@ -1265,7 +1412,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                requestBody= reader.ReadToEnd();
            //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
-            response.KeepAlive = true;
            OSD llsdRequest = null;
            OSD llsdResponse = null;
@@ -1308,13 +1454,20 @@ namespace OpenSim.Framework.Servers.HttpServer
                    else
                    {
                        // Oops, no handler for this..   give em the failed message
-                        llsdResponse = GenerateNoLLSDHandlerResponse();
+                        notfound = true;
                    }
                }
            }
            else
            {
-                llsdResponse = GenerateNoLLSDHandlerResponse();
+                notfound = true;
+            }
+            if(notfound)
+            {
+                response.StatusCode = (int)HttpStatusCode.NotFound;
+                response.StatusDescription = "Not found";
+                return null;
            }
            byte[] buffer = new byte[0];
@@ -1333,10 +1486,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                buffer = BuildLLSDResponse(request, response, llsdResponse);
            }
-            response.SendChunked = false;
            response.ContentLength64 = buffer.Length;
            response.ContentEncoding = Encoding.UTF8;
-            response.KeepAlive = true;
            return buffer;
        }
@@ -1541,15 +1692,6 @@ namespace OpenSim.Framework.Servers.HttpServer
            }
        }
-        private OSDMap GenerateNoLLSDHandlerResponse()
-        {
-            OSDMap map = new OSDMap();
-            map["reason"] = OSD.FromString("LLSDRequest");
-            map["message"] = OSD.FromString("No handler registered for LLSD Requests");
-            map["login"] = OSD.FromString("false");
-            return map;
-        }
        public byte[] HandleHTTPRequest(OSHttpRequest request, OSHttpResponse response)
        {
 //            m_log.DebugFormat(
@@ -1559,6 +1701,9 @@ namespace OpenSim.Framework.Servers.HttpServer
            switch (request.HttpMethod)
            {
                case "OPTIONS":
+                    response.AddHeader("Access-Control-Allow-Origin", "*");
+                    response.AddHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT, OPTIONS");
+                    response.AddHeader("Access-Control-Allow-Headers", "Content-Type");
                    response.StatusCode = (int)OSHttpStatusCode.SuccessOk;
                    return null;
@@ -1781,20 +1926,13 @@ namespace OpenSim.Framework.Servers.HttpServer
            {
                response.ProtocolVersion = (string)responsedata["http_protocol_version"];
            }
-/*
            if (responsedata.ContainsKey("keepalive"))
            {
                bool keepalive = (bool)responsedata["keepalive"];
                response.KeepAlive = keepalive;
            }
-            if (responsedata.ContainsKey("reusecontext"))
-                response.ReuseContext = (bool) responsedata["reusecontext"];
-*/
-            // disable this things
-            response.KeepAlive = false;
-            response.ReuseContext = false;
            // Cross-Origin Resource Sharing with simple requests
            if (responsedata.ContainsKey("access_control_allow_origin"))
                response.AddHeader("Access-Control-Allow-Origin", (string)responsedata["access_control_allow_origin"]);
@@ -1807,11 +1945,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                contentType = "text/html";
            }
            // The client ignores anything but 200 here for web login, so ensure that this is 200 for that
            response.StatusCode = responsecode;
            if (responsecode == (int)OSHttpStatusCode.RedirectMovedPermanently)
@@ -1821,7 +1956,6 @@ namespace OpenSim.Framework.Servers.HttpServer
            }
            response.AddHeader("Content-Type", contentType);
            if (responsedata.ContainsKey("headers"))
            {
                Hashtable headerdata = (Hashtable)responsedata["headers"];
@@ -1840,10 +1974,6 @@ namespace OpenSim.Framework.Servers.HttpServer
            {
                if (!(contentType.Contains("image")
                    || contentType.Contains("x-shockwave-flash")
-                    || contentType.Contains("application/gzip")
-                    || contentType.Contains("application/pdf")
-                    || contentType.Contains("application/zip")
-                    || contentType.Contains("application/x-xz")
                    || contentType.Contains("application/x-oar")
                    || contentType.Contains("application/vnd.ll.mesh")))
                {
@@ -1856,7 +1986,6 @@ namespace OpenSim.Framework.Servers.HttpServer
                    buffer = Convert.FromBase64String(responseString);
                }
-                response.SendChunked = false;
                response.ContentLength64 = buffer.Length;
                response.ContentEncoding = Encoding.UTF8;
            }
@@ -1873,7 +2002,6 @@ namespace OpenSim.Framework.Servers.HttpServer
            string responseString = GetHTTP404(host);
            byte[] buffer = Encoding.UTF8.GetBytes(responseString);
-            response.SendChunked = false;
            response.ContentLength64 = buffer.Length;
            response.ContentEncoding = Encoding.UTF8;
@@ -1889,17 +2017,15 @@ namespace OpenSim.Framework.Servers.HttpServer
            string responseString = GetHTTP500();
            byte[] buffer = Encoding.UTF8.GetBytes(responseString);
-            response.SendChunked = false;
            response.ContentLength64 = buffer.Length;
            response.ContentEncoding = Encoding.UTF8;
            return buffer;
        }
        public void Start()
        {
-            Start(true);
+            Start(true, true);
        }
        /// <summary>
@@ -1909,7 +2035,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        /// If true then poll responses are performed asynchronsly.
        /// Option exists to allow regression tests to perform processing synchronously.
        /// </param>
-        public void Start(bool performPollResponsesAsync)
+        public void Start(bool performPollResponsesAsync, bool runPool)
        {
            m_log.InfoFormat(
                "[BASE HTTP SERVER]: Starting {0} server on port {1}", UseSSL ? "HTTPS" : "HTTP", Port);
@@ -1938,6 +2064,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                    //m_httpListener.Prefixes.Add("https://+:" + (m_sslport) + "/");
                    //m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
                    m_httpListener2 = CoolHTTPListener.Create(IPAddress.Any, (int)m_port, m_cert);
+                    if(m_certificateValidationCallback != null)
+                        m_httpListener2.CertificateValidationCallback = m_certificateValidationCallback;
                    m_httpListener2.ExceptionThrown += httpServerException;
                    m_httpListener2.LogWriter = httpserverlog;
                }
@@ -1946,10 +2074,15 @@ namespace OpenSim.Framework.Servers.HttpServer
                //m_httpListener.Start();
                m_httpListener2.Start(64);
-                // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events
+                lock(m_generalLock)
+                {
-                PollServiceRequestManager = new PollServiceRequestManager(this, performPollResponsesAsync, 2, 25000);
+                    if (runPool)
-                PollServiceRequestManager.Start();
+                    {
+                        if(m_pollServiceManager == null)
+                            m_pollServiceManager = new PollServiceRequestManager(performPollResponsesAsync, 2, 25000);
+                        m_pollServiceManager.Start();
+                    }
+                }
                HTTPDRunning = true;
@@ -1963,7 +2096,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            catch (Exception e)
            {
                m_log.Error("[BASE HTTP SERVER]: Error - " + e.Message);
-                m_log.Error("[BASE HTTP SERVER]: Tip: Do you have permission to listen on port " + m_port + ", " + m_sslport + "?");
+                m_log.Error("[BASE HTTP SERVER]: Tip: Do you have permission to listen on port " + m_port + "?");
                // We want this exception to halt the entire server since in current configurations we aren't too
                // useful without inbound HTTP.
@@ -2002,18 +2135,9 @@ namespace OpenSim.Framework.Servers.HttpServer
            if (source.ToString() == "HttpServer.HttpListener" && exception.ToString().StartsWith("Mono.Security.Protocol.Tls.TlsException"))
                return;
            m_log.ErrorFormat("[BASE HTTP SERVER]: {0} had an exception {1}", source.ToString(), exception.ToString());
-           /*
-            if (HTTPDRunning)// && NotSocketErrors > 5)
-            {
-                Stop();
-                Thread.Sleep(200);
-                StartHTTP();
-                m_log.Warn("[HTTPSERVER]: Died.  Trying to kick.....");
-            }
-            */
        }
-        public void Stop()
+        public void Stop(bool stopPool = false)
        {
            HTTPDRunning = false;
@@ -2021,8 +2145,11 @@ namespace OpenSim.Framework.Servers.HttpServer
            try
            {
-                if(PollServiceRequestManager != null)
+                lock(m_generalLock)
-                    PollServiceRequestManager.Stop();
+                {
+                    if (stopPool && m_pollServiceManager != null)
+                        m_pollServiceManager.Stop();
+                }
                m_httpListener2.ExceptionThrown -= httpServerException;
                //m_httpListener2.DisconnectHandler = null;
@@ -2129,17 +2256,16 @@ namespace OpenSim.Framework.Servers.HttpServer
            string file = Path.Combine(".", "http_500.html");
            if (!File.Exists(file))
                return getDefaultHTTP500();
+            string result;
-            StreamReader sr = File.OpenText(file);
+            using(StreamReader sr = File.OpenText(file))
-            string result = sr.ReadToEnd();
+                result = sr.ReadToEnd();
-            sr.Close();
            return result;
        }
        // Fallback HTTP responses in case the HTTP error response files don't exist
        private static string getDefaultHTTP404(string host)
        {
-            return "<HTML><HEAD><TITLE>404 Page not found</TITLE><BODY><BR /><H1>Ooops!</H1><P>The page you requested doesn't exist.</P></BODY></HTML>";
+            return "<HTML><HEAD><TITLE>404 Page not found</TITLE><BODY><BR /><H1>Ooops!</H1><P>The page you requested doesn't exist.</P><P>If you are trying to log-in, your link parameters should have: &quot;-loginpage http://" + host + "/?method=login -loginuri http://" + host + "/&quot; in your link.</P><</BODY></HTML>";
        }
        private static string getDefaultHTTP500()
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs
index f61b090..aba15b0 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IOSHttpResponse.cs
@@ -118,8 +118,6 @@ namespace OpenSim.Framework.Servers.HttpServer
        /// </summary>
        string StatusDescription { get; set; }
-        bool ReuseContext { get; set; }
        /// <summary>
        /// Add a header field and content to the response.
        /// </summary>
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
index d7744fc..5a49881 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
@@ -195,6 +195,42 @@ namespace OpenSim.Framework.Servers.HttpServer
            }
        }
+        public byte[] RawBuffer
+        {
+            get
+            {
+                return _httpResponse.RawBuffer;
+            }
+            set
+            {
+                _httpResponse.RawBuffer = value;
+            }
+        }
+        public int RawBufferStart
+        {
+            get
+            {
+                return _httpResponse.RawBufferStart;
+            }
+            set
+            {
+                _httpResponse.RawBufferStart = value;
+            }
+        }
+        public int RawBufferLen
+        {
+            get
+            {
+                return _httpResponse.RawBufferLen;
+            }
+            set
+            {
+                _httpResponse.RawBufferLen = value;
+            }
+        }
        /// <summary>
        /// Set a redirct location.
        /// </summary>
@@ -215,12 +251,12 @@ namespace OpenSim.Framework.Servers.HttpServer
        {
            get
            {
-                    return _httpResponse.Chunked;
+               return _httpResponse.Chunked;
            }
            set
            {
-                _httpResponse.Chunked = value;
+               _httpResponse.Chunked = value;
            }
        }
@@ -257,27 +293,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            }
        }
-        public bool ReuseContext
-        {
-            get
-            {
-                if (_httpClientContext != null)
-                {
-                    return !_httpClientContext.EndWhenDone;
-                }
-                return true;
-            }
-            set
-            {
-                if (_httpClientContext != null)
-                {
-                    _httpClientContext.EndWhenDone = !value;
-                }
-            }
-        }
        protected IHttpResponse _httpResponse;
-        private IHttpClientContext _httpClientContext;
        public OSHttpResponse() {}
@@ -295,12 +311,12 @@ namespace OpenSim.Framework.Servers.HttpServer
        public OSHttpResponse(OSHttpRequest req)
        {
            _httpResponse = new HttpResponse(req.IHttpClientContext, req.IHttpRequest);
-            _httpClientContext = req.IHttpClientContext;
        }
-        public OSHttpResponse(HttpResponse resp, IHttpClientContext clientContext)
+        public OSHttpResponse(HttpResponse resp)
        {
            _httpResponse = resp;
-            _httpClientContext = clientContext;
        }
        /// <summary>
@@ -320,15 +336,8 @@ namespace OpenSim.Framework.Servers.HttpServer
        /// </summary>
        public void Send()
        {
-            _httpResponse.Body.Flush();
+            _httpResponse.Chunked = false;
            _httpResponse.Send();
        }
-        public void FreeContext()
-        {
-            if (_httpClientContext != null)
-                _httpClientContext.Close();
-        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 7150aad..ed7c081 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -37,6 +37,7 @@ namespace OpenSim.Framework.Servers.HttpServer
    public delegate Hashtable GetEventsMethod(UUID requestID, UUID pId);
    public delegate Hashtable NoEventsMethod(UUID requestID, UUID pId);
+    public delegate void DropMethod(UUID requestID, UUID pId);
    public class PollServiceEventArgs : EventArgs
    {
@@ -44,6 +45,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        public GetEventsMethod GetEvents;
        public NoEventsMethod NoEvents;
        public RequestMethod Request;
+        public DropMethod Drop;
        public UUID Id;
        public int TimeOutms;
        public EventType Type;
@@ -54,7 +56,9 @@ namespace OpenSim.Framework.Servers.HttpServer
            LslHttp = 1,
            Inventory = 2,
            Texture = 3,
-            Mesh = 4
+            Mesh = 4,
+            Mesh2 = 5,
+            Asset = 6
        }
        public string Url { get; set; }
@@ -73,13 +77,14 @@ namespace OpenSim.Framework.Servers.HttpServer
            RequestMethod pRequest,
            string pUrl,
            HasEventsMethod pHasEvents, GetEventsMethod pGetEvents, NoEventsMethod pNoEvents,
-            UUID pId, int pTimeOutms)
+            DropMethod pDrop, UUID pId, int pTimeOutms)
        {
            Request = pRequest;
            Url = pUrl;
            HasEvents = pHasEvents;
            GetEvents = pGetEvents;
            NoEvents = pNoEvents;
+            Drop = pDrop;
            Id = pId;
            TimeOutms = pTimeOutms;
            Type = EventType.Poll;
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
index 60eca5f..f83b771 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
@@ -47,8 +47,10 @@ namespace OpenSim.Framework.Servers.HttpServer
        public readonly UUID RequestID;
        public int  contextHash;
+/*
        private void GenContextHash()
        {
            Random rnd = new Random();
            contextHash = 0;
            if (Request.Headers["remote_addr"] != null)
@@ -62,8 +64,9 @@ namespace OpenSim.Framework.Servers.HttpServer
            }
            else
                contextHash += rnd.Next() & 0xffff;
-        }
+        }
+*/
        public PollServiceHttpRequest(
            PollServiceEventArgs pPollServiceArgs, IHttpClientContext pHttpContext, IHttpRequest pRequest)
        {
@@ -72,58 +75,181 @@ namespace OpenSim.Framework.Servers.HttpServer
            Request = pRequest;
            RequestTime = System.Environment.TickCount;
            RequestID = UUID.Random();
-            GenContextHash();
+//            GenContextHash();
+            contextHash = HttpContext.contextID;
        }
-        internal void DoHTTPGruntWork(BaseHttpServer server, Hashtable responsedata)
+        internal void DoHTTPGruntWork(Hashtable responsedata)
        {
+            if (Request.Body.CanRead)
+                Request.Body.Dispose();
            OSHttpResponse response
-                = new OSHttpResponse(new HttpResponse(HttpContext, Request), HttpContext);
+                = new OSHttpResponse(new HttpResponse(HttpContext, Request));
-            byte[] buffer = server.DoHTTPGruntWork(responsedata, response);
+            if (responsedata == null)
+            {
+                SendNoContentError(response);
+                return;
+            }
-            if(Request.Body.CanRead)
+            int responsecode = 200;
-                Request.Body.Dispose();
+            string responseString = String.Empty;
+            string contentType;
+            byte[] buffer = null;
+            int rangeStart = 0;
+            int rangeLen = -1;
-            response.SendChunked = false;
+            try
-            response.ContentLength64 = buffer.Length;
+            {
-            response.ContentEncoding = Encoding.UTF8;
+                //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response");
-            response.ReuseContext = false;
+                if(responsedata["int_response_code"] != null)
+                    responsecode = (int)responsedata["int_response_code"];
+                if (responsedata["bin_response_data"] != null)
+                {
+                    buffer = (byte[])responsedata["bin_response_data"];
+                    responsedata["bin_response_data"] = null;
+                    if (responsedata["bin_start"] != null)
+                        rangeStart = (int)responsedata["bin_start"];
+                    if (responsedata["int_bytes"] != null)
+                        rangeLen = (int)responsedata["int_bytes"];
+                }
+                else
+                    responseString = (string)responsedata["str_response_string"];
+                contentType = (string)responsedata["content_type"];
+                if (responseString == null)
+                    responseString = String.Empty;
+            }
+            catch
+            {
+                SendNoContentError(response);
+                return;
+            }
+            if (responsedata.ContainsKey("error_status_text"))
+                response.StatusDescription = (string)responsedata["error_status_text"];
+            if (responsedata.ContainsKey("http_protocol_version"))
+                response.ProtocolVersion = (string)responsedata["http_protocol_version"];
+            if (responsedata.ContainsKey("keepalive"))
+                response.KeepAlive = (bool)responsedata["keepalive"];
+            // Cross-Origin Resource Sharing with simple requests
+            if (responsedata.ContainsKey("access_control_allow_origin"))
+                response.AddHeader("Access-Control-Allow-Origin", (string)responsedata["access_control_allow_origin"]);
+            response.StatusCode = responsecode;
+            if (responsecode == (int)OSHttpStatusCode.RedirectMovedPermanently)
+            {
+                response.RedirectLocation = (string)responsedata["str_redirect_location"];
+            }
+            if (string.IsNullOrEmpty(contentType))
+                response.AddHeader("Content-Type", "text/html");
+            else
+                response.AddHeader("Content-Type", contentType);
+            if (responsedata.ContainsKey("headers"))
+            {
+                Hashtable headerdata = (Hashtable)responsedata["headers"];
+                foreach (string header in headerdata.Keys)
+                    response.AddHeader(header, headerdata[header].ToString());
+            }
+            if(buffer == null)
+            {
+                if (!(contentType.Contains("image")
+                    || contentType.Contains("x-shockwave-flash")
+                    || contentType.Contains("application/x-oar")
+                    || contentType.Contains("application/vnd.ll.mesh")))
+                {
+                    // Text
+                    buffer = Encoding.UTF8.GetBytes(responseString);
+                }
+                else
+                {
+                    // Binary!
+                    buffer = Convert.FromBase64String(responseString);
+                }
+                response.ContentEncoding = Encoding.UTF8;
+            }
+            if (rangeStart < 0 || rangeStart > buffer.Length)
+                rangeStart = 0;
+            if (rangeLen < 0)
+                rangeLen = buffer.Length;
+            else if (rangeLen + rangeStart > buffer.Length)
+                rangeLen = buffer.Length - rangeStart;
+            response.ContentLength64 = rangeLen;
            try
            {
-                response.OutputStream.Write(buffer, 0, buffer.Length);
+                if(rangeLen > 0)
-                response.OutputStream.Flush();
+                {
-                response.Send();
+                    response.RawBufferStart = rangeStart;
+                    response.RawBufferLen = rangeLen;
+                    response.RawBuffer = buffer;
+                    //response.OutputStream.Write(buffer, rangeStart, rangeLen);
+                }
                buffer = null;
+                response.Send();
+                response.RawBuffer = null;
            }
            catch (Exception ex)
            {
-                m_log.Warn("[POLL SERVICE WORKER THREAD]: Error ", ex);
+                if(ex is System.Net.Sockets.SocketException)
+                {
+                    // only mute connection reset by peer so we are not totally blind for now
+                    if(((System.Net.Sockets.SocketException)ex).SocketErrorCode != System.Net.Sockets.SocketError.ConnectionReset)
+                         m_log.Warn("[POLL SERVICE WORKER THREAD]: Error ", ex);
+                }
+                else
+                    m_log.Warn("[POLL SERVICE WORKER THREAD]: Error ", ex);
            }
            PollServiceArgs.RequestsHandled++;
        }
-        internal void DoHTTPstop(BaseHttpServer server)
+        internal void SendNoContentError(OSHttpResponse response)
+        {
+            response.ContentLength64 = 0;
+            response.ContentEncoding = Encoding.UTF8;
+            response.StatusCode = 500;
+            try
+            {
+                response.Send();
+            }
+            catch { }
+            return;
+        }
+        internal void DoHTTPstop()
        {
            OSHttpResponse response
-                = new OSHttpResponse(new HttpResponse(HttpContext, Request), HttpContext);
+                = new OSHttpResponse(new HttpResponse(HttpContext, Request));
            if(Request.Body.CanRead)
                Request.Body.Dispose();
-            response.SendChunked = false;
            response.ContentLength64 = 0;
            response.ContentEncoding = Encoding.UTF8;
-            response.ReuseContext = false;
            response.KeepAlive = false;
-            response.SendChunked = false;
            response.StatusCode = 503;
            try
            {
-                response.OutputStream.Flush();
                response.Send();
            }
            catch
@@ -131,20 +257,4 @@ namespace OpenSim.Framework.Servers.HttpServer
            }
        }
    }
-    class PollServiceHttpRequestComparer : IEqualityComparer<PollServiceHttpRequest>
-    {
-        public bool Equals(PollServiceHttpRequest b1, PollServiceHttpRequest b2)
-        {
-            if (b1.contextHash != b2.contextHash)
-                return false;
-            bool b = Object.ReferenceEquals(b1.HttpContext, b2.HttpContext);
-            return b;
-        }
-        public int GetHashCode(PollServiceHttpRequest b2)
-        {
-            return (int)b2.contextHash;
-        }
-    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
index c6a3e65..790aa99 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -30,13 +30,10 @@ using System.Collections;
 using System.Threading;
 using System.Reflection;
 using log4net;
-using HttpServer;
-using OpenSim.Framework;
 using OpenSim.Framework.Monitoring;
 using Amib.Threading;
-using System.IO;
-using System.Text;
 using System.Collections.Generic;
+using System.Collections.Concurrent;
 namespace OpenSim.Framework.Servers.HttpServer
 {
@@ -44,11 +41,9 @@ namespace OpenSim.Framework.Servers.HttpServer
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private readonly BaseHttpServer m_server;
+        private Dictionary<int, Queue<PollServiceHttpRequest>> m_bycontext;
+        private BlockingCollection<PollServiceHttpRequest> m_requests = new BlockingCollection<PollServiceHttpRequest>();
-        private Dictionary<PollServiceHttpRequest, Queue<PollServiceHttpRequest>> m_bycontext;
+        private ConcurrentQueue<PollServiceHttpRequest> m_retryRequests = new ConcurrentQueue<PollServiceHttpRequest>();
-        private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
-        private static Queue<PollServiceHttpRequest> m_retryRequests = new Queue<PollServiceHttpRequest>();
        private uint m_WorkerThreadCount = 0;
        private Thread[] m_workerThreads;
@@ -59,14 +54,12 @@ namespace OpenSim.Framework.Servers.HttpServer
        private SmartThreadPool m_threadPool;
        public PollServiceRequestManager(
-            BaseHttpServer pSrv, bool performResponsesAsync, uint pWorkerThreadCount, int pTimeout)
+            bool performResponsesAsync, uint pWorkerThreadCount, int pTimeout)
        {
-            m_server = pSrv;
            m_WorkerThreadCount = pWorkerThreadCount;
            m_workerThreads = new Thread[m_WorkerThreadCount];
-            PollServiceHttpRequestComparer preqCp = new PollServiceHttpRequestComparer();
+            m_bycontext = new Dictionary<int, Queue<PollServiceHttpRequest>>(256);
-            m_bycontext = new Dictionary<PollServiceHttpRequest, Queue<PollServiceHttpRequest>>(preqCp);
            STPStartInfo startInfo = new STPStartInfo();
            startInfo.IdleTimeout = 30000;
@@ -81,6 +74,8 @@ namespace OpenSim.Framework.Servers.HttpServer
        public void Start()
        {
+            if(m_running)
+                return;
            m_running = true;
            m_threadPool.Start();
            //startup worker threads
@@ -89,7 +84,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                m_workerThreads[i]
                    = WorkManager.StartThread(
                        PoolWorkerJob,
-                        string.Format("PollServiceWorkerThread {0}:{1}", i, m_server.Port),
+                        string.Format("PollServiceWorkerThread {0}", i),
                        ThreadPriority.Normal,
                        true,
                        false,
@@ -99,38 +94,34 @@ namespace OpenSim.Framework.Servers.HttpServer
            m_retrysThread = WorkManager.StartThread(
                this.CheckRetries,
-                string.Format("PollServiceWatcherThread:{0}", m_server.Port),
+                string.Format("PollServiceWatcherThread"),
                ThreadPriority.Normal,
                true,
                true,
                null,
                1000 * 60 * 10);
        }
        private void ReQueueEvent(PollServiceHttpRequest req)
        {
            if (m_running)
-            {
+                m_retryRequests.Enqueue(req);
-                lock (m_retryRequests)
-                    m_retryRequests.Enqueue(req);
-            }
        }
        public void Enqueue(PollServiceHttpRequest req)
        {
+            Queue<PollServiceHttpRequest> ctxQeueue;
+            int rhash = req.contextHash;
            lock (m_bycontext)
            {
-                Queue<PollServiceHttpRequest> ctxQeueue;
+                if (m_bycontext.TryGetValue(rhash, out ctxQeueue))
-                if (m_bycontext.TryGetValue(req, out ctxQeueue))
                {
                    ctxQeueue.Enqueue(req);
                }
                else
                {
                    ctxQeueue = new Queue<PollServiceHttpRequest>();
-                    m_bycontext[req] = ctxQeueue;
+                    m_bycontext[rhash] = ctxQeueue;
                    EnqueueInt(req);
                }
            }
@@ -139,9 +130,10 @@ namespace OpenSim.Framework.Servers.HttpServer
        public void byContextDequeue(PollServiceHttpRequest req)
        {
            Queue<PollServiceHttpRequest> ctxQeueue;
+            int rhash = req.contextHash;
            lock (m_bycontext)
            {
-                if (m_bycontext.TryGetValue(req, out ctxQeueue))
+                if (m_bycontext.TryGetValue(rhash, out ctxQeueue))
                {
                    if (ctxQeueue.Count > 0)
                    {
@@ -150,35 +142,49 @@ namespace OpenSim.Framework.Servers.HttpServer
                    }
                    else
                    {
-                        m_bycontext.Remove(req);
+                        m_bycontext.Remove(rhash);
                    }
                }
            }
        }
+        public void DropByContext(PollServiceHttpRequest req)
+        {
+            Queue<PollServiceHttpRequest> ctxQeueue;
+            int rhash = req.contextHash;
+            lock (m_bycontext)
+            {
+                if (m_bycontext.TryGetValue(rhash, out ctxQeueue))
+                {
+                    ctxQeueue.Clear();
+                    m_bycontext.Remove(rhash);
+                }
+            }
+        }
        public void EnqueueInt(PollServiceHttpRequest req)
        {
            if (m_running)
-                m_requests.Enqueue(req);
+                m_requests.Add(req);
        }
        private void CheckRetries()
        {
+            PollServiceHttpRequest preq;
            while (m_running)
            {
-                Thread.Sleep(100); // let the world move  .. back to faster rate
+                Thread.Sleep(100);
                Watchdog.UpdateThread();
-                lock (m_retryRequests)
+                while (m_running && m_retryRequests.TryDequeue(out preq))
-                {
+                    m_requests.Add(preq);
-                    while (m_retryRequests.Count > 0 && m_running)
-                        m_requests.Enqueue(m_retryRequests.Dequeue());
-                }
            }
        }
        public void Stop()
        {
+            if(!m_running)
+                return;
            m_running = false;
            Thread.Sleep(100); // let the world move
@@ -194,103 +200,123 @@ namespace OpenSim.Framework.Servers.HttpServer
                qu.Clear();
            m_bycontext.Clear();
+            PollServiceHttpRequest req;
            try
            {
-                foreach (PollServiceHttpRequest req in m_retryRequests)
+                while(m_retryRequests.TryDequeue(out req))
-                {
+                    req.DoHTTPstop();
-                    req.DoHTTPstop(m_server);
-                }
            }
            catch
            {
            }
-            PollServiceHttpRequest wreq;
+            try
+            {
-            m_retryRequests.Clear();
+                while(m_requests.TryTake(out req, 0))
+                    req.DoHTTPstop();
-            while (m_requests.Count() > 0)
+            }
+            catch
            {
-                try
-                {
-                    wreq = m_requests.Dequeue(0);
-                    wreq.DoHTTPstop(m_server);
-                }
-                catch
-                {
-                }
            }
-            m_requests.Clear();
+            m_requests.Dispose();
        }
        // work threads
        private void PoolWorkerJob()
        {
+            PollServiceHttpRequest req;
            while (m_running)
            {
-                PollServiceHttpRequest req = m_requests.Dequeue(4500);
+                try
-                Watchdog.UpdateThread();
-                if (req != null)
                {
-                    try
+                    req = null;
+                    if (!m_requests.TryTake(out req, 4500) || req == null)
                    {
-                        if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
+                        Watchdog.UpdateThread();
+                        continue;
+                    }
+                    Watchdog.UpdateThread();
+                    if (!req.HttpContext.CanSend())
+                    {
+                        req.PollServiceArgs.Drop(req.RequestID, req.PollServiceArgs.Id);
+                        byContextDequeue(req);
+                        continue;
+                    }
+                    if (req.HttpContext.IsSending())
+                    {
+                        if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
                        {
-                            Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
+                            req.PollServiceArgs.Drop(req.RequestID, req.PollServiceArgs.Id);
+                            byContextDequeue(req);
+                        }
+                        else
+                            ReQueueEvent(req);
+                        continue;
+                    }
+                    if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
+                    {
+                        PollServiceHttpRequest nreq = req;
+                        m_threadPool.QueueWorkItem(x =>
+                        {
+                            try
+                            {
+                                Hashtable responsedata = nreq.PollServiceArgs.GetEvents(nreq.RequestID, nreq.PollServiceArgs.Id);
+                                nreq.DoHTTPGruntWork(responsedata);
+                            }
+                            catch (ObjectDisposedException) { }
+                            finally
+                            {
+                                byContextDequeue(nreq);
+                                nreq = null;
+                            }
+                            return null;
+                        }, null);
+                    }
+                    else
+                    {
+                        if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
+                        {
+                            PollServiceHttpRequest nreq = req;
                            m_threadPool.QueueWorkItem(x =>
                            {
                                try
                                {
-                                    req.DoHTTPGruntWork(m_server, responsedata);
+                                    nreq.DoHTTPGruntWork(nreq.PollServiceArgs.NoEvents(nreq.RequestID, nreq.PollServiceArgs.Id));
-                                }
-                                catch (ObjectDisposedException)
-                                {
                                }
+                                catch (ObjectDisposedException) { }
                                finally
                                {
-                                    byContextDequeue(req);
+                                    byContextDequeue(nreq);
+                                    nreq = null;
                                }
                                return null;
                            }, null);
                        }
                        else
                        {
-                            if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
+                            ReQueueEvent(req);
-                            {
-                                m_threadPool.QueueWorkItem(x =>
-                                {
-                                    try
-                                    {
-                                        req.DoHTTPGruntWork(m_server,
-                                            req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
-                                    }
-                                    catch (ObjectDisposedException)
-                                    {
-                                    // Ignore it, no need to reply
-                                    }
-                                    finally
-                                    {
-                                        byContextDequeue(req);
-                                    }
-                                    return null;
-                                }, null);
-                            }
-                            else
-                            {
-                                ReQueueEvent(req);
-                            }
                        }
                    }
-                    catch (Exception e)
+                }
-                    {
+                catch (ThreadAbortException)
-                        m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
+                {
-                    }
+                    Thread.ResetAbort();
+                    // Shouldn't set this to 'false', the normal shutdown should cause things to exit
+                    // but robust is still not normal neither is mono
+                    m_running = false;
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
                }
            }
        }
    }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
index 67fc14e..bd55657 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
@@ -54,8 +54,6 @@ namespace OpenSim.Framework.Servers.HttpServer
            TRequest deserial;
            using (XmlTextReader xmlReader = new XmlTextReader(request))
            {
-                xmlReader.ProhibitDtd = true;
                XmlSerializer deserializer = new XmlSerializer(typeof (TRequest));
                deserial = (TRequest) deserializer.Deserialize(xmlReader);
            }
diff --git a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
index 158befa..68073c1 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -210,8 +210,6 @@ namespace OpenSim.Framework.Servers.HttpServer
            {
                try
                {
-                    xmlReader.ProhibitDtd = true;
                    XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>));
                    deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader);
                }
@@ -271,8 +269,6 @@ namespace OpenSim.Framework.Servers.HttpServer
            {
                try
                {
-                    xmlReader.ProhibitDtd = true;
                    XmlSerializer deserializer = new XmlSerializer(typeof(TRequest));
                    deserial = (TRequest)deserializer.Deserialize(xmlReader);
                }
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 9b1d906..a42ff83 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -42,6 +42,7 @@ namespace OpenSim.Framework.Servers
 //        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private static BaseHttpServer instance = null;
+        private static BaseHttpServer unsecureinstance = null;
        private static Dictionary<uint, BaseHttpServer> m_Servers = new Dictionary<uint, BaseHttpServer>();
        /// <summary>
@@ -86,10 +87,26 @@ namespace OpenSim.Framework.Servers
            set
            {
                lock (m_Servers)
+                {
+                    if (!m_Servers.ContainsValue(value))
+                        throw new Exception("HTTP server must already have been registered to be set as the main instance");
+                    instance = value;
+                }
+            }
+        }
+        public static BaseHttpServer UnSecureInstance
+        {
+            get { return unsecureinstance; }
+            set
+            {
+                lock (m_Servers)
                    if (!m_Servers.ContainsValue(value))
                        throw new Exception("HTTP server must already have been registered to be set as the main instance");
-                instance = value;
+                unsecureinstance = value;
            }
        }
@@ -175,35 +192,35 @@ namespace OpenSim.Framework.Servers
                if (!int.TryParse(rawNewDebug, out newDebug))
                {
-                    MainConsole.Instance.OutputFormat("{0} is not a valid debug level", rawNewDebug);
+                    MainConsole.Instance.Output("{0} is not a valid debug level", rawNewDebug);
                    return;
                }
                if (newDebug < 0 || newDebug > 6)
                {
-                    MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0..6", newDebug);
+                    MainConsole.Instance.Output("{0} is outside the valid debug level range of 0..6", newDebug);
                    return;
                }
                if (allReqs || inReqs)
                {
                    MainServer.DebugLevel = newDebug;
-                    MainConsole.Instance.OutputFormat("IN debug level set to {0}", newDebug);
+                    MainConsole.Instance.Output("IN debug level set to {0}", newDebug);
                }
                if (allReqs || outReqs)
                {
                    WebUtil.DebugLevel = newDebug;
-                    MainConsole.Instance.OutputFormat("OUT debug level set to {0}", newDebug);
+                    MainConsole.Instance.Output("OUT debug level set to {0}", newDebug);
                }
            }
            else
            {
                if (allReqs || inReqs)
-                    MainConsole.Instance.OutputFormat("Current IN debug level is {0}", MainServer.DebugLevel);
+                    MainConsole.Instance.Output("Current IN debug level is {0}", DebugLevel);
                if (allReqs || outReqs)
-                    MainConsole.Instance.OutputFormat("Current OUT debug level is {0}", WebUtil.DebugLevel);
+                    MainConsole.Instance.Output("Current OUT debug level is {0}", WebUtil.DebugLevel);
            }
        }
@@ -360,10 +377,9 @@ namespace OpenSim.Framework.Servers
            {
                foreach (BaseHttpServer httpServer in m_Servers.Values)
                {
-                    httpServer.Stop();
+                    httpServer.Stop(true);
                }
            }
        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 3c2dce8..81b112f 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -31,6 +31,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -491,24 +492,28 @@ namespace OpenSim.Framework.Servers
            if (!int.TryParse(rawLevel, out newLevel))
            {
-                MainConsole.Instance.OutputFormat("{0} is not a valid debug level", rawLevel);
+                MainConsole.Instance.Output("{0} is not a valid debug level", rawLevel);
                return;
            }
            if (newLevel < 0 || newLevel > Util.MAX_THREADPOOL_LEVEL)
            {
-                MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0.." + Util.MAX_THREADPOOL_LEVEL, newLevel);
+                MainConsole.Instance.Output("{0} is outside the valid debug level range of 0.." + Util.MAX_THREADPOOL_LEVEL, newLevel);
                return;
            }
            Util.LogThreadPool = newLevel;
-            MainConsole.Instance.OutputFormat("LogThreadPool set to {0}", newLevel);
+            MainConsole.Instance.Output("LogThreadPool set to {0}", newLevel);
        }
        private void HandleForceGc(string module, string[] args)
        {
            Notice("Manually invoking runtime garbage collection");
+            GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.CompactOnce;
            GC.Collect();
+            GC.WaitForPendingFinalizers();
+            GC.Collect();
+            GCSettings.LargeObjectHeapCompactionMode = GCLargeObjectHeapCompactionMode.Default;
        }
        public virtual void HandleShow(string module, string[] cmd)
@@ -923,9 +928,7 @@ namespace OpenSim.Framework.Servers
            }
            catch { }
-            if (
+            if (Util.FireAndForgetMethod == FireAndForgetMethod.QueueUserWorkItem)
-                Util.FireAndForgetMethod == FireAndForgetMethod.QueueUserWorkItem
-                    || Util.FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem)
            {
                sb.AppendFormat("\nThread pool used: Framework main threadpool\n");
                return sb.ToString();
@@ -988,9 +991,9 @@ namespace OpenSim.Framework.Servers
            }
            if (Watchdog.AbortThread(threadId))
-                MainConsole.Instance.OutputFormat("Aborted thread with id {0}", threadId);
+                MainConsole.Instance.Output("Aborted thread with id {0}", threadId);
            else
-                MainConsole.Instance.OutputFormat("ERROR - Thread with id {0} not found in managed threads", threadId);
+                MainConsole.Instance.Output("ERROR - Thread with id {0} not found in managed threads", threadId);
        }
        /// <summary>
@@ -1017,7 +1020,7 @@ namespace OpenSim.Framework.Servers
        protected void Notice(string format, params object[] components)
        {
            if (m_console != null)
-                m_console.OutputFormat(format, components);
+                m_console.Output(format, components);
        }
        public virtual void Shutdown()
diff --git a/OpenSim/Framework/TerrainData.cs b/OpenSim/Framework/TerrainData.cs
index 5cec2b5..0e5e83e 100644
--- a/OpenSim/Framework/TerrainData.cs
+++ b/OpenSim/Framework/TerrainData.cs
@@ -37,52 +37,6 @@ using log4net;
 namespace OpenSim.Framework
 {
-    public abstract class TerrainData
-    {
-        // Terrain always is a square
-        public int SizeX { get; protected set; }
-        public int SizeY { get; protected set; }
-        public int SizeZ { get; protected set; }
-        // A height used when the user doesn't specify anything
-        public const float DefaultTerrainHeight = 21f;
-        public abstract float this[int x, int y] { get; set; }
-        // Someday terrain will have caves
-        // at most holes :p
-        public abstract float this[int x, int y, int z] { get; set; }
-        public abstract bool IsTaintedAt(int xx, int yy);
-        public abstract bool IsTaintedAt(int xx, int yy, bool clearOnTest);
-        public abstract void TaintAllTerrain();
-        public abstract void ClearTaint();
-        public abstract void ClearLand();
-        public abstract void ClearLand(float height);
-        // Return a representation of this terrain for storing as a blob in the database.
-        // Returns 'true' to say blob was stored in the 'out' locations.
-        public abstract bool GetDatabaseBlob(out int DBFormatRevisionCode, out Array blob);
-        // Given a revision code and a blob from the database, create and return the right type of TerrainData.
-        // The sizes passed are the expected size of the region. The database info will be used to
-        //     initialize the heightmap of that sized region with as much data is in the blob.
-        // Return created TerrainData or 'null' if unsuccessful.
-        public static TerrainData CreateFromDatabaseBlobFactory(int pSizeX, int pSizeY, int pSizeZ, int pFormatCode, byte[] pBlob)
-        {
-            // For the moment, there is only one implementation class
-            return new HeightmapTerrainData(pSizeX, pSizeY, pSizeZ, pFormatCode, pBlob);
-        }
-        // return a special compressed representation of the heightmap in ushort
-        public abstract float[] GetCompressedMap();
-        public abstract float CompressionFactor { get; }
-        public abstract float[] GetFloatsSerialized();
-        public abstract double[,] GetDoubles();
-        public abstract TerrainData Clone();
-    }
    // The terrain is stored in the database as a blob with a 'revision' field.
    // Some implementations of terrain storage would fill the revision field with
    //    the time the terrain was stored. When real revisions were added and this
@@ -112,18 +66,37 @@ namespace OpenSim.Framework
        RevisionHigh = 1234
    }
-    // Version of terrain that is a heightmap.
+    public class TerrainData
-    // This should really be 'LLOptimizedHeightmapTerrainData' as it includes knowledge
-    //    of 'patches' which are 16x16 terrain areas which can be sent separately to the viewer.
-    // The heighmap is kept as an array of ushorts. The ushort values are converted to
-    //    and from floats by TerrainCompressionFactor.
-    public class HeightmapTerrainData : TerrainData
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        private static string LogHeader = "[HEIGHTMAP TERRAIN DATA]";
+        private static string LogHeader = "[TERRAIN DATA]";
+        private float[,] m_heightmap;
+        // Remember subregions of the heightmap that has changed.
+        private bool[,] m_taint;
+        // legacy CompressionFactor
+        public float CompressionFactor { get; private set; }
+        // Terrain always is a square
+        public int SizeX { get; protected set; }
+        public int SizeY { get; protected set; }
+        public int SizeZ { get; protected set; }
+        // A height used when the user doesn't specify anything
+        public const float DefaultTerrainHeight = 21f;
+        // Given a revision code and a blob from the database, create and return the right type of TerrainData.
+        // The sizes passed are the expected size of the region. The database info will be used to
+        //     initialize the heightmap of that sized region with as much data is in the blob.
+        // Return created TerrainData or 'null' if unsuccessful.
+        public static TerrainData CreateFromDatabaseBlobFactory(int pSizeX, int pSizeY, int pSizeZ, int pFormatCode, byte[] pBlob)
+        {
+            // For the moment, there is only one implementation class
+            return new TerrainData(pSizeX, pSizeY, pSizeZ, pFormatCode, pBlob);
+        }
-        // TerrainData.this[x, y]
+        public float this[int x, int y]
-        public override float this[int x, int y]
        {
            get { return m_heightmap[x, y]; }
            set
@@ -136,21 +109,18 @@ namespace OpenSim.Framework
            }
        }
-        // TerrainData.this[x, y, z]
+        public float this[int x, int y, int z]
-        public override float this[int x, int y, int z]
        {
            get { return this[x, y]; }
            set { this[x, y] = value; }
        }
-        // TerrainData.ClearTaint
+        public void ClearTaint()
-        public override void ClearTaint()
        {
            SetAllTaint(false);
        }
-        // TerrainData.TaintAllTerrain
+        public void TaintAllTerrain()
-        public override void TaintAllTerrain()
        {
            SetAllTaint(true);
        }
@@ -162,13 +132,12 @@ namespace OpenSim.Framework
                    m_taint[ii, jj] = setting;
        }
-        // TerrainData.ClearLand
+        public void ClearLand()
-        public override void ClearLand()
        {
            ClearLand(DefaultTerrainHeight);
        }
-        // TerrainData.ClearLand(float)
-        public override void ClearLand(float pHeight)
+        public void ClearLand(float pHeight)
        {
            for (int xx = 0; xx < SizeX; xx++)
                for (int yy = 0; yy < SizeY; yy++)
@@ -178,7 +147,7 @@ namespace OpenSim.Framework
        // Return 'true' of the patch that contains these region coordinates has been modified.
        // Note that checking the taint clears it.
        // There is existing code that relies on this feature.
-        public override bool IsTaintedAt(int xx, int yy, bool clearOnTest)
+        public bool IsTaintedAt(int xx, int yy, bool clearOnTest)
        {
            int tx = xx / Constants.TerrainPatchSize;
            int ty = yy / Constants.TerrainPatchSize;
@@ -191,41 +160,22 @@ namespace OpenSim.Framework
        // Old form that clears the taint flag when we check it.
        // ubit: this dangerus naming should be only check without clear
        // keeping for old modules outthere
-        public override bool IsTaintedAt(int xx, int yy)
+        public bool IsTaintedAt(int xx, int yy)
        {
            return IsTaintedAt(xx, yy, true /* clearOnTest */);
        }
        // TerrainData.GetDatabaseBlob
        // The user wants something to store in the database.
-        public override bool GetDatabaseBlob(out int DBRevisionCode, out Array blob)
+        public bool GetDatabaseBlob(out int DBRevisionCode, out Array blob)
        {
-            bool ret = false;
+            DBRevisionCode = (int)DBTerrainRevision.Variable2DGzip;
-/* save all as Variable2DGzip
+            blob = ToCompressedTerrainSerializationV2DGzip();
-            if (SizeX == Constants.RegionSize && SizeY == Constants.RegionSize)
+            return true;
-            {
-                DBRevisionCode = (int)DBTerrainRevision.Legacy256;
-                blob = ToLegacyTerrainSerialization();
-                ret = true;
-            }
-            else
-            {
-*/
-                DBRevisionCode = (int)DBTerrainRevision.Variable2DGzip;
-//                DBRevisionCode = (int)DBTerrainRevision.Variable2D;
-                blob = ToCompressedTerrainSerializationV2DGzip();
-//                blob = ToCompressedTerrainSerializationV2D();
-                ret = true;
-//            }
-            return ret;
        }
-        // TerrainData.CompressionFactor
-        private float m_compressionFactor = 100.0f;
-        public override float CompressionFactor { get { return m_compressionFactor; } }
        // TerrainData.GetCompressedMap
-        public override float[] GetCompressedMap()
+        public float[] GetCompressedMap()
        {
            float[] newMap = new float[SizeX * SizeY];
@@ -235,21 +185,16 @@ namespace OpenSim.Framework
                    newMap[ind++] = m_heightmap[xx, yy];
            return newMap;
        }
-        // TerrainData.Clone
-        public override TerrainData Clone()
+        public TerrainData Clone()
        {
-            HeightmapTerrainData ret = new HeightmapTerrainData(SizeX, SizeY, SizeZ);
+            TerrainData ret = new TerrainData(SizeX, SizeY, SizeZ);
            ret.m_heightmap = (float[,])this.m_heightmap.Clone();
            return ret;
        }
-        // TerrainData.GetFloatsSerialized
+        public float[] GetFloatsSerialized()
-        // This one dimensional version is ordered so height = map[y*sizeX+x];
-        // DEPRECATED: don't use this function as it does not retain the dimensions of the terrain
-        //     and the caller will probably do the wrong thing if the terrain is not the legacy 256x256.
-        public override float[] GetFloatsSerialized()
        {
            int points = SizeX * SizeY;
            float[] heights = new float[points];
@@ -264,8 +209,7 @@ namespace OpenSim.Framework
            return heights;
        }
-        // TerrainData.GetDoubles
+        public double[,] GetDoubles()
-        public override double[,] GetDoubles()
        {
            double[,] ret = new double[SizeX, SizeY];
            for (int xx = 0; xx < SizeX; xx++)
@@ -275,14 +219,53 @@ namespace OpenSim.Framework
            return ret;
        }
+        public unsafe void GetPatchMinMax(int px, int py, out float zmin, out float zmax)
+        {
+            zmax = float.MinValue;
+            zmin = float.MaxValue;
-        // =============================================================
+            int stride = m_heightmap.GetLength(1);
-        private float[,] m_heightmap;
+            int startx = px * 16 * stride;
-        // Remember subregions of the heightmap that has changed.
+            int endx = (px + 1) * 16 * stride;
-        private bool[,] m_taint;
+            int starty = py * 16;
+            fixed (float* map = m_heightmap)
+            {
+                for (int i = startx; i < endx; i += stride)
+                {
+                    float* p = &map[i];
+                    for (int j = starty; j < starty + 16; j++)
+                    {
+                        float val = p[j];
+                        if (val > zmax) zmax = val;
+                        if (val < zmin) zmin = val;
+                    }
+                }
+            }
+        }
+        public unsafe void GetPatchBlock(float[] _block, int px, int py, float sub, float premult)
+        {
+            int k = 0;
+            int stride = m_heightmap.GetLength(1);
-        //    that is coded as the float height times the compression factor (usually '100'
+            int startX = px * 16 * stride;
+            int endX = (px + 1) * 16 * stride;
+            int startY = py * 16;
+            fixed(float* block = _block, map = m_heightmap)
+            {
+                for (int y = startY; y < startY + 16; y++)
+                {
+                    for (int x = startX; x < endX; x += stride)
+                    {
+                        block[k++] = (map[x + y] - sub) * premult;
+                    }
+                }
+            }
+        }
+/*
+ //    that is coded as the float height times the compression factor (usually '100'
        //    to make for two decimal points).
        public short ToCompressedHeightshort(float pHeight)
        {
@@ -305,6 +288,7 @@ namespace OpenSim.Framework
                return ushort.MaxValue;
            return (ushort)pHeight;
        }
+*/
        public float FromCompressedHeight(short pHeight)
        {
@@ -318,12 +302,12 @@ namespace OpenSim.Framework
        // To keep with the legacy theme, create an instance of this class based on the
        //     way terrain used to be passed around.
-        public HeightmapTerrainData(double[,] pTerrain)
+        public TerrainData(double[,] pTerrain)
        {
            SizeX = pTerrain.GetLength(0);
            SizeY = pTerrain.GetLength(1);
            SizeZ = (int)Constants.RegionHeight;
-            m_compressionFactor = 100.0f;
+            CompressionFactor = 100.0f;
            m_heightmap = new float[SizeX, SizeY];
            for (int ii = 0; ii < SizeX; ii++)
@@ -341,12 +325,12 @@ namespace OpenSim.Framework
        }
        // Create underlying structures but don't initialize the heightmap assuming the caller will immediately do that
-        public HeightmapTerrainData(int pX, int pY, int pZ)
+        public TerrainData(int pX, int pY, int pZ)
        {
            SizeX = pX;
            SizeY = pY;
            SizeZ = pZ;
-            m_compressionFactor = 100.0f;
+            CompressionFactor = 100.0f;
            m_heightmap = new float[SizeX, SizeY];
            m_taint = new bool[SizeX / Constants.TerrainPatchSize, SizeY / Constants.TerrainPatchSize];
            // m_log.DebugFormat("{0} new by dimensions. sizeX={1}, sizeY={2}, sizeZ={3}", LogHeader, SizeX, SizeY, SizeZ);
@@ -354,10 +338,10 @@ namespace OpenSim.Framework
            ClearLand(0f);
        }
-        public HeightmapTerrainData(float[] cmap, float pCompressionFactor, int pX, int pY, int pZ)
+        public TerrainData(float[] cmap, float pCompressionFactor, int pX, int pY, int pZ)
            : this(pX, pY, pZ)
        {
-            m_compressionFactor = pCompressionFactor;
+            CompressionFactor = pCompressionFactor;
            int ind = 0;
            for (int xx = 0; xx < SizeX; xx++)
                for (int yy = 0; yy < SizeY; yy++)
@@ -366,7 +350,7 @@ namespace OpenSim.Framework
        }
        // Create a heighmap from a database blob
-        public HeightmapTerrainData(int pSizeX, int pSizeY, int pSizeZ, int pFormatCode, byte[] pBlob)
+        public TerrainData(int pSizeX, int pSizeY, int pSizeZ, int pFormatCode, byte[] pBlob)
            : this(pSizeX, pSizeY, pSizeZ)
        {
            switch ((DBTerrainRevision)pFormatCode)
@@ -476,13 +460,9 @@ namespace OpenSim.Framework
                    ret = str.ToArray();
                }
            }
-            catch
+            catch {}
-            {
-            }
-            m_log.DebugFormat("{0} V2D {1} bytes",
+            m_log.DebugFormat("{0} V2D {1} bytes", LogHeader, ret.Length);
-                     LogHeader, ret.Length);
            return ret;
        }
@@ -502,7 +482,8 @@ namespace OpenSim.Framework
                        for (int yy = 0; yy < SizeY; yy++)
                            for (int xx = 0; xx < SizeX; xx++)
                            {
-                                bw.Write((float)m_heightmap[xx, yy]);
+                                //bw.Write((float)m_heightmap[xx, yy]);
+                                bw.Write((float)Math.Round(m_heightmap[xx, yy], 3, MidpointRounding.AwayFromZero));
                            }
                        bw.Flush();
@@ -520,12 +501,9 @@ namespace OpenSim.Framework
                    }
                }
            }
-            catch
+            catch {}
-            {
-            }
+            m_log.DebugFormat("{0} V2DGzip {1} bytes", LogHeader, ret.Length);
-            m_log.DebugFormat("{0} V2DGzip {1} bytes",
-                 LogHeader, ret.Length);
            return ret;
        }
@@ -548,7 +526,7 @@ namespace OpenSim.Framework
                    hmSizeY = br.ReadInt32();
                    hmCompressionFactor = br.ReadInt32();
-                    m_compressionFactor = hmCompressionFactor;
+                    CompressionFactor = hmCompressionFactor;
                    // In case database info doesn't match real terrain size, initialize the whole terrain.
                    ClearLand();
diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
index 5ad0030..c8eb57d 100644
--- a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
@@ -220,12 +220,6 @@ namespace OpenSim.Framework.Tests
            AvAppearance.VisualParams = VisualParams;
-            List<byte> wearbyte = new List<byte>();
-            for (int i = 0; i < VisualParams.Length; i++)
-            {
-                wearbyte.Add(VisualParams[i]);
-            }
            AvAppearance.SetAppearance(AvAppearance.Texture, (byte[])VisualParams.Clone());
        }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 1afc5a4..187ed4f 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -30,6 +30,8 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Diagnostics;
+using System.Drawing;
+using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.IO.Compression;
@@ -92,6 +94,7 @@ namespace OpenSim.Framework
        // explicitly given
        All = 0x8e000,
        AllAndExport = 0x9e000,
+        AllAndExportNoMod = 0x9a000,
        AllEffective = 0x9e000,
        UnfoldedMask = 0x1e000
    }
@@ -108,9 +111,7 @@ namespace OpenSim.Framework
    {
        None,
        RegressionTest,
-        UnsafeQueueUserWorkItem,
        QueueUserWorkItem,
-        BeginInvoke,
        SmartThreadPool,
        Thread,
    }
@@ -261,10 +262,7 @@ namespace OpenSim.Framework
        /// <returns>The distance between the two vectors</returns>
        public static double GetDistanceTo(Vector3 a, Vector3 b)
        {
-            float dx = a.X - b.X;
+            return Vector3.Distance(a,b);
-            float dy = a.Y - b.Y;
-            float dz = a.Z - b.Z;
-            return Math.Sqrt(dx * dx + dy * dy + dz * dz);
        }
        /// <summary>
@@ -276,10 +274,7 @@ namespace OpenSim.Framework
        /// <returns></returns>
        public static bool DistanceLessThan(Vector3 a, Vector3 b, double amount)
        {
-            float dx = a.X - b.X;
+            return Vector3.DistanceSquared(a,b) < (amount * amount);
-            float dy = a.Y - b.Y;
-            float dz = a.Z - b.Z;
-            return (dx*dx + dy*dy + dz*dz) < (amount*amount);
        }
        /// <summary>
@@ -380,15 +375,17 @@ namespace OpenSim.Framework
            get { return randomClass; }
        }
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
        public static ulong UIntsToLong(uint X, uint Y)
        {
-            return Utils.UIntsToLong(X, Y);
+            return ((ulong)X << 32) | (ulong)Y;
        }
        // Regions are identified with a 'handle' made up of its world coordinates packed into a ulong.
        // Region handles are based on the coordinate of the region corner with lower X and Y
        // var regions need more work than this to get that right corner from a generic world position
        // this corner must be on a grid point
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
        public static ulong RegionWorldLocToHandle(uint X, uint Y)
        {
           ulong handle = X & 0xffffff00; // make sure it matchs grid coord points.
@@ -397,6 +394,7 @@ namespace OpenSim.Framework
           return handle;
        }
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
        public static ulong RegionGridLocToHandle(uint X, uint Y)
        {
            ulong handle = X;
@@ -405,12 +403,14 @@ namespace OpenSim.Framework
            return handle;
        }
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
        public static void RegionHandleToWorldLoc(ulong handle, out uint X, out uint Y)
        {
            X = (uint)(handle >> 32);
            Y = (uint)(handle & 0xfffffffful);
        }
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
        public static void RegionHandleToRegionLoc(ulong handle, out uint X, out uint Y)
        {
            X = (uint)(handle >> 40) & 0x00ffffffu; //  bring from higher half, divide by 256 and clean
@@ -420,21 +420,25 @@ namespace OpenSim.Framework
        // A region location can be 'world coordinates' (meters) or 'region grid coordinates'
        // grid coordinates have a fixed step of 256m as defined by viewers
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
        public static uint WorldToRegionLoc(uint worldCoord)
        {
            return worldCoord >> 8;
        }
        // Convert a region's 'region grid coordinate' to its 'world coordinate'.
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
        public static uint RegionToWorldLoc(uint regionCoord)
        {
            return regionCoord << 8;
        }
-        public static bool checkServiceURI(string uristr, out string serviceURI)
+        public static bool checkServiceURI(string uristr, out string serviceURI, out string serviceHost, out string serviceIPstr)
        {
            serviceURI = string.Empty;
+            serviceHost = string.Empty;
+            serviceIPstr = string.Empty;
            try
            {
                Uri  uri = new Uri(uristr);
@@ -443,6 +447,13 @@ namespace OpenSim.Framework
                    serviceURI = serviceURI.Trim(new char[] { '/', ' ' }) +":80/";
                else if(uri.Port == 443)
                    serviceURI = serviceURI.Trim(new char[] { '/', ' ' }) +":443/";
+                serviceHost = uri.Host;
+                IPEndPoint ep = Util.getEndPoint(serviceHost,uri.Port);
+                if(ep == null)
+                    return false;
+                serviceIPstr = ep.Address.ToString();
                return true;
            }
            catch
@@ -452,9 +463,10 @@ namespace OpenSim.Framework
            return false;
        }
-        public static bool buildHGRegionURI(string inputName, out string serverURI, out string regionName)
+        public static bool buildHGRegionURI(string inputName, out string serverURI, out string serverHost, out string regionName)
        {
            serverURI = string.Empty;
+            serverHost = string.Empty;
            regionName = string.Empty;
            inputName = inputName.Trim();
@@ -563,6 +575,7 @@ namespace OpenSim.Framework
                serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":80/";
            else if(uri.Port == 443)
                serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":443/";
+            serverHost = uri.Host;
            return true;
        }
@@ -575,14 +588,15 @@ namespace OpenSim.Framework
        }
        // Clamp the maximum magnitude of a vector
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
        public static Vector3 ClampV(Vector3 x, float max)
        {
            float lenSq = x.LengthSquared();
            if (lenSq > (max * max))
            {
-                x = x / x.Length() * max;
+                lenSq = max / (float)Math.Sqrt(lenSq);
+                x = x * lenSq;
            }
            return x;
        }
@@ -671,7 +685,7 @@ namespace OpenSim.Framework
        public static string GetFormattedXml(string rawXml)
        {
            XmlDocument xd = new XmlDocument();
-            xd.XmlResolver=null;
            xd.LoadXml(rawXml);
            StringBuilder sb = new StringBuilder();
@@ -825,8 +839,8 @@ namespace OpenSim.Framework
        private static byte[] ComputeMD5Hash(string data, Encoding encoding)
        {
-            MD5 md5 = MD5.Create();
+            using(MD5 md5 = MD5.Create())
-            return md5.ComputeHash(encoding.GetBytes(data));
+                return md5.ComputeHash(encoding.GetBytes(data));
        }
        /// <summary>
@@ -859,11 +873,24 @@ namespace OpenSim.Framework
        private static byte[] ComputeSHA1Hash(byte[] src)
        {
            byte[] ret;
-            using(SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider())
+            using (SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider())
-                 ret = SHA1.ComputeHash(src);
+                ret = SHA1.ComputeHash(src);
            return ret;
        }
+        public static UUID ComputeSHA1UUID(string src)
+        {
+            return ComputeSHA1UUID(Encoding.Default.GetBytes(src));
+        }
+        public static UUID ComputeSHA1UUID(byte[] src)
+        {
+            byte[] ret;
+            using (SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider())
+                ret = SHA1.ComputeHash(src);
+            return new UUID(ret, 2);
+        }
        public static int fast_distance2d(int x, int y)
        {
            x = Math.Abs(x);
@@ -883,7 +910,7 @@ namespace OpenSim.Framework
        /// <returns></returns>
        public static bool IsInsideBox(Vector3 v, Vector3 min, Vector3 max)
        {
-            return v.X >= min.X & v.Y >= min.Y && v.Z >= min.Z
+            return v.X >= min.X && v.Y >= min.Y && v.Z >= min.Z
                && v.X <= max.X && v.Y <= max.Y && v.Z <= max.Z;
        }
@@ -1279,12 +1306,12 @@ namespace OpenSim.Framework
        public static string dbDir()
        {
-            return Path.Combine("..", Path.Combine("..", "db"));
+            return Path.Combine("..", Path.Combine("..", "var/lib/db"));
        }
        public static string cacheDir()
        {
-            return Path.Combine("..", Path.Combine("..", "caches"));
+            return Path.Combine("..", Path.Combine("..", "var/cache"));
        }
        public static string configDir()
@@ -1300,7 +1327,7 @@ namespace OpenSim.Framework
        public static string logsDir()
        {
-            return Path.Combine("..", "logs");
+            return Path.Combine("..", "var/log");
        }
        public static string webDir()
@@ -1935,7 +1962,9 @@ namespace OpenSim.Framework
            string ru = String.Empty;
            if (Environment.OSVersion.Platform == PlatformID.Unix)
-                ru = "Unix/Mono";
+            {
+               ru = "Unix/Mono";
+            }
            else
                if (Environment.OSVersion.Platform == PlatformID.MacOSX)
                    ru = "OSX/Mono";
@@ -2385,6 +2414,38 @@ namespace OpenSim.Framework
            return sb.ToString();
        }
+        public static bool TryParseHttpRange(string header, out int start, out int end)
+        {
+            start = end = 0;
+            if (header.StartsWith("bytes="))
+            {
+                string[] rangeValues = header.Substring(6).Split('-');
+                if (rangeValues.Length == 2)
+                {
+                    string rawStart = rangeValues[0].Trim();
+                    if (rawStart != "" && !Int32.TryParse(rawStart, out start))
+                        return false;
+                    if (start < 0)
+                        return false;
+                    string rawEnd = rangeValues[1].Trim();
+                    if (rawEnd == "")
+                    {
+                        end = -1;
+                        return true;
+                    }
+                    else if (Int32.TryParse(rawEnd, out end))
+                        return end > 0;
+                }
+            }
+            start = end = 0;
+            return false;
+        }
        /// <summary>
        /// Used to trigger an early library load on Windows systems.
        /// </summary>
@@ -2408,53 +2469,6 @@ namespace OpenSim.Framework
        #region FireAndForget Threading Pattern
-        /// <summary>
-        /// Created to work around a limitation in Mono with nested delegates
-        /// </summary>
-        private sealed class FireAndForgetWrapper
-        {
-            private static volatile FireAndForgetWrapper instance;
-            private static object syncRoot = new Object();
-            public static FireAndForgetWrapper Instance {
-                get {
-                    if (instance == null)
-                    {
-                        lock (syncRoot)
-                        {
-                            if (instance == null)
-                            {
-                                instance = new FireAndForgetWrapper();
-                            }
-                        }
-                    }
-                    return instance;
-                }
-            }
-            public void FireAndForget(System.Threading.WaitCallback callback)
-            {
-                callback.BeginInvoke(null, EndFireAndForget, callback);
-            }
-            public void FireAndForget(System.Threading.WaitCallback callback, object obj)
-            {
-                callback.BeginInvoke(obj, EndFireAndForget, callback);
-            }
-            private static void EndFireAndForget(IAsyncResult ar)
-            {
-                System.Threading.WaitCallback callback = (System.Threading.WaitCallback)ar.AsyncState;
-                try { callback.EndInvoke(ar); }
-                catch (Exception ex) { m_log.Error("[UTIL]: Asynchronous method threw an exception: " + ex.Message, ex); }
-                ar.AsyncWaitHandle.Close();
-            }
-        }
        public static void InitThreadPool(int minThreads, int maxThreads)
        {
            if (maxThreads < 2)
@@ -2485,16 +2499,17 @@ namespace OpenSim.Framework
            switch (FireAndForgetMethod)
            {
-                case FireAndForgetMethod.UnsafeQueueUserWorkItem:
                case FireAndForgetMethod.QueueUserWorkItem:
-                case FireAndForgetMethod.BeginInvoke:
                    int workerThreads, iocpThreads;
                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
                    return workerThreads;
                case FireAndForgetMethod.SmartThreadPool:
                    return m_ThreadPool.MaxThreads - m_ThreadPool.InUseThreads;
                case FireAndForgetMethod.Thread:
-                    return MAX_SYSTEM_THREADS - System.Diagnostics.Process.GetCurrentProcess().Threads.Count;
+                {
+                    using(Process p = System.Diagnostics.Process.GetCurrentProcess())
+                        return MAX_SYSTEM_THREADS - p.Threads.Count;
+                }
                default:
                    throw new NotImplementedException();
            }
@@ -2641,20 +2656,6 @@ namespace OpenSim.Framework
        public static void FireAndForget(System.Threading.WaitCallback callback, object obj, string context, bool dotimeout = true)
        {
            Interlocked.Increment(ref numTotalThreadFuncsCalled);
-/*
-            if (context != null)
-            {
-                if (!m_fireAndForgetCallsMade.ContainsKey(context))
-                    m_fireAndForgetCallsMade[context] = 1;
-                else
-                    m_fireAndForgetCallsMade[context]++;
-                if (!m_fireAndForgetCallsInProgress.ContainsKey(context))
-                    m_fireAndForgetCallsInProgress[context] = 1;
-                else
-                    m_fireAndForgetCallsInProgress[context]++;
-            }
-*/
            WaitCallback realCallback;
            bool loggingEnabled = LogThreadPool > 0;
@@ -2670,9 +2671,6 @@ namespace OpenSim.Framework
                    {
                        Culture.SetCurrentCulture();
                        callback(o);
-//                        if (context != null)
-//                            m_fireAndForgetCallsInProgress[context]--;
                    };
            }
            else
@@ -2693,7 +2691,6 @@ namespace OpenSim.Framework
                            m_log.DebugFormat("Run threadfunc {0} (Queued {1}, Running {2})", threadFuncNum, numQueued1, numRunning1);
                        Culture.SetCurrentCulture();
                        callback(o);
                    }
                    catch (ThreadAbortException)
@@ -2711,9 +2708,6 @@ namespace OpenSim.Framework
                        activeThreads.TryRemove(threadFuncNum, out dummy);
                        if ((loggingEnabled || (threadFuncOverloadMode == 1)) && threadInfo.LogThread)
                            m_log.DebugFormat("Exit threadfunc {0} ({1})", threadFuncNum, FormatDuration(threadInfo.Elapsed()));
-//                        if (context != null)
-//                            m_fireAndForgetCallsInProgress[context]--;
                    }
                };
            }
@@ -2721,45 +2715,7 @@ namespace OpenSim.Framework
            long numQueued = Interlocked.Increment(ref numQueuedThreadFuncs);
            try
            {
-/*
+                threadInfo.LogThread = false;
-                long numRunning = numRunningThreadFuncs;
-                if (m_ThreadPool != null && LogOverloads)
-                {
-                    if ((threadFuncOverloadMode == 0) && (numRunning >= m_ThreadPool.MaxThreads))
-                    {
-                        if (Interlocked.CompareExchange(ref threadFuncOverloadMode, 1, 0) == 0)
-                            m_log.DebugFormat("Threadfunc: enable overload mode (Queued {0}, Running {1})", numQueued, numRunning);
-                    }
-                    else if ((threadFuncOverloadMode == 1) && (numRunning <= (m_ThreadPool.MaxThreads * 2) / 3))
-                    {
-                        if (Interlocked.CompareExchange(ref threadFuncOverloadMode, 0, 1) == 1)
-                            m_log.DebugFormat("Threadfunc: disable overload mode (Queued {0}, Running {1})", numQueued, numRunning);
-                    }
-                }
-                if (loggingEnabled || (threadFuncOverloadMode == 1))
-                {
-                    string full, partial;
-                    GetFireAndForgetStackTrace(out full, out partial);
-                    threadInfo.StackTrace = full;
-                    threadInfo.LogThread = ShouldLogThread(partial);
-                    if (threadInfo.LogThread)
-                    {
-                        m_log.DebugFormat("Queue threadfunc {0} (Queued {1}, Running {2}) {3}{4}",
-                            threadFuncNum, numQueued, numRunningThreadFuncs,
-                            (context == null) ? "" : ("(" + context + ") "),
-                            (LogThreadPool >= 2) ? full : partial);
-                    }
-                }
-                else
-*/
-                {
-                    // Since we didn't log "Queue threadfunc", don't log "Run threadfunc" or "End threadfunc" either.
-                    // Those log lines aren't useful when we don't know which function is running in the thread.
-                    threadInfo.LogThread = false;
-                }
                switch (FireAndForgetMethod)
                {
@@ -2767,16 +2723,9 @@ namespace OpenSim.Framework
                    case FireAndForgetMethod.None:
                        realCallback.Invoke(obj);
                        break;
-                    case FireAndForgetMethod.UnsafeQueueUserWorkItem:
-                        ThreadPool.UnsafeQueueUserWorkItem(realCallback, obj);
-                        break;
                    case FireAndForgetMethod.QueueUserWorkItem:
                        ThreadPool.QueueUserWorkItem(realCallback, obj);
                        break;
-                    case FireAndForgetMethod.BeginInvoke:
-                        FireAndForgetWrapper wrapper = FireAndForgetWrapper.Instance;
-                        wrapper.FireAndForget(realCallback, obj);
-                        break;
                    case FireAndForgetMethod.SmartThreadPool:
                        if (m_ThreadPool == null)
                            InitThreadPool(2, 15);
@@ -2879,6 +2828,12 @@ namespace OpenSim.Framework
        /// <returns>The stack trace, or null if failed to get it</returns>
        private static StackTrace GetStackTrace(Thread targetThread)
        {
+            return null;
+/*
+        not only this does not work on mono but it is not longer recomended on windows.
+        can cause deadlocks etc.
            if (IsPlatformMono)
            {
                // This doesn't work in Mono
@@ -2941,6 +2896,7 @@ namespace OpenSim.Framework
                // Signal the fallack-thread to stop
                exitedSafely.Set();
            }
+*/
        }
 #pragma warning restore 0618
@@ -3038,16 +2994,37 @@ namespace OpenSim.Framework
            return tcA - tcB;
        }
+        public static long GetPhysicalMemUse()
+        {
+            using (Process p = System.Diagnostics.Process.GetCurrentProcess())
+                return p.WorkingSet64;
+        }
        // returns a timestamp in ms as double
        // using the time resolution avaiable to StopWatch
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]  
        public static double GetTimeStamp()
        {
-            return (double)Stopwatch.GetTimestamp() * TimeStampClockPeriod;
+            return Stopwatch.GetTimestamp() * TimeStampClockPeriod;
        }
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
        public static double GetTimeStampMS()
        {
-            return (double)Stopwatch.GetTimestamp() * TimeStampClockPeriodMS;
+            return Stopwatch.GetTimestamp() * TimeStampClockPeriodMS;
+        }
+        // doing math in ticks is usefull to avoid loss of resolution
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
+        public static long GetTimeStampTicks()
+        {
+            return Stopwatch.GetTimestamp();
+        }
+        [System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
+        public static double TimeStampTicksToMS(long ticks)
+        {
+            return ticks * TimeStampClockPeriodMS;
        }
        /// <summary>
@@ -3428,9 +3405,46 @@ namespace OpenSim.Framework
            if (length > 2000)
                xml = xml.Substring(0, 2000) + "...";
+            for (int i = 0 ; i < xml.Length ; i++)
+            {
+                if (xml[i] < 0x20)
+                {
+                    xml = "Unprintable binary data";
+                    break;
+                }
+            }
            m_log.ErrorFormat("{0} Failed XML ({1} bytes) = {2}", message, length, xml);
        }
+        /// <summary>
+        /// Performs a high quality image resize
+        /// </summary>
+        /// <param name="image">Image to resize</param>
+        /// <param name="width">New width</param>
+        /// <param name="height">New height</param>
+        /// <returns>Resized image</returns>
+        public static Bitmap ResizeImageSolid(Image image, int width, int height)
+        {
+            Bitmap result = new Bitmap(width, height, PixelFormat.Format24bppRgb);
+            using (ImageAttributes atrib = new ImageAttributes())
+            using (Graphics graphics = Graphics.FromImage(result))
+            {
+                atrib.SetWrapMode(System.Drawing.Drawing2D.WrapMode.TileFlipXY);
+                atrib.SetWrapMode(System.Drawing.Drawing2D.WrapMode.TileFlipXY);
+                graphics.CompositingQuality = System.Drawing.Drawing2D.CompositingQuality.HighQuality;
+                graphics.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.HighQualityBicubic;
+                graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+                graphics.PixelOffsetMode = System.Drawing.Drawing2D.PixelOffsetMode.None;
+                graphics.DrawImage(image,new Rectangle(0,0, result.Width, result.Height),
+                    0, 0, image.Width, image.Height, GraphicsUnit.Pixel, atrib);
+            }
+            return result;
+        }
    }
 /*  don't like this code
@@ -3595,5 +3609,6 @@ namespace OpenSim.Framework
        {
            rng.GetBytes(buff);
        }
    }
 }
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
index 2250496..d2674a0 100644
--- a/OpenSim/Framework/VersionInfo.cs
+++ b/OpenSim/Framework/VersionInfo.cs
@@ -29,8 +29,8 @@ namespace OpenSim
 {
    public class VersionInfo
    {
-        public const string VersionNumber = "0.9.0.2";
+        public const string VersionNumber = "0.9.1.1";
-        public const string AssemblyVersionNumber = "0.9.0.*";
+        public const string AssemblyVersionNumber = "0.9.1.1";
        public const string SC_BUILD_NUMBER = "0";
        public const Flavour VERSION_FLAVOUR = Flavour.Dev;
@@ -76,8 +76,12 @@ namespace OpenSim
        /// <remarks>
        /// The protocol version that we will use for outgoing transfers
        /// Valid values are
+        /// "SIMULATION/0.8"
+        ///     - up to 45 avatar textures - 11 baked
+        /// "SIMULATION/0.7"
+        ///     TP uses call back again
        /// "SIMULATION/0.3"
-        ///   - This is the latest, and it supports teleports to variable-sized regions
+        ///   - supports teleports to variable-sized regions
        ///   - Older versions can teleport to this one, but only if the destination region
        ///     is 256x256
        /// "SIMULATION/0.2"
@@ -87,8 +91,8 @@ namespace OpenSim
        ///   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
        /// </remarks>
        public readonly static float SimulationServiceVersionAcceptedMin = 0.3f;
-        public readonly static float SimulationServiceVersionAcceptedMax = 0.6f;
+        public readonly static float SimulationServiceVersionAcceptedMax = 0.8f;
        public readonly static float SimulationServiceVersionSupportedMin = 0.3f;
-        public readonly static float SimulationServiceVersionSupportedMax = 0.6f;
+        public readonly static float SimulationServiceVersionSupportedMax = 0.8f;
    }
 }
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs
index 427e149..f832ff9 100644
--- a/OpenSim/Framework/WearableCacheItem.cs
+++ b/OpenSim/Framework/WearableCacheItem.cs
@@ -128,31 +128,27 @@ namespace OpenSim.Framework
            return arr;
        }
-        public static OSDArray BakedToOSD(WearableCacheItem[] pcacheItems)
+        public static OSDArray BakedToOSD(WearableCacheItem[] pcacheItems, int start, int end)
        {
-            if (pcacheItems.Length < AvatarAppearance.BAKE_INDICES[AvatarAppearance.BAKE_INDICES.Length - 1])
-                return null;
            OSDArray arr = new OSDArray();
+            if(start < 0)
+                start = 0;
+            if (end < 0 || end > AvatarAppearance.BAKE_INDICES.Length)
+                end = AvatarAppearance.BAKE_INDICES.Length;
+            if (start > end)
+                return null;
-            for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
+            for (int i = start; i < end; i++)
            {
                int idx = AvatarAppearance.BAKE_INDICES[i];
+                if(idx >= pcacheItems.Length)
+                    continue;
                WearableCacheItem item = pcacheItems[idx];
                OSDMap itemmap = new OSDMap();
                itemmap.Add("textureindex", OSD.FromUInteger(item.TextureIndex));
                itemmap.Add("cacheid", OSD.FromUUID(item.CacheId));
                itemmap.Add("textureid", OSD.FromUUID(item.TextureID));
-/*
-                if (item.TextureAsset != null)
-                {
-                    itemmap.Add("assetdata", OSD.FromBinary(item.TextureAsset.Data));
-                    itemmap.Add("assetcreator", OSD.FromString(item.TextureAsset.CreatorID));
-                    itemmap.Add("assetname", OSD.FromString(item.TextureAsset.Name));
-                }
- */
                arr.Add(itemmap);
            }
            return arr;
@@ -161,29 +157,17 @@ namespace OpenSim.Framework
        public static WearableCacheItem[] BakedFromOSD(OSD pInput)
        {
            WearableCacheItem[] pcache = WearableCacheItem.GetDefaultCacheItem();
            if (pInput.Type == OSDType.Array)
            {
                OSDArray itemarray = (OSDArray)pInput;
                foreach (OSDMap item in itemarray)
                {
-                    int idx = (int)item["textureindex"].AsUInteger();
+                    int idx = item["textureindex"].AsInteger();
-                    if (idx < 0 || idx > pcache.Length)
+                    if (idx < 0 || idx >= pcache.Length)
                        continue;
                    pcache[idx].CacheId = item["cacheid"].AsUUID();
                    pcache[idx].TextureID = item["textureid"].AsUUID();
-/*
+                    pcache[idx].TextureAsset = null;
-                    if (item.ContainsKey("assetdata"))
-                    {
-                        AssetBase asset = new AssetBase(item["textureid"].AsUUID(), "BakedTexture", (sbyte)AssetType.Texture, UUID.Zero.ToString());
-                        asset.Temporary = true;
-                        asset.Local = true;
-                        asset.Data = item["assetdata"].AsBinary();
-                        pcache[idx].TextureAsset = asset;
-                    }
-                    else
- */
-                        pcache[idx].TextureAsset = null;
                }
            }
            return pcache;
@@ -217,6 +201,4 @@ namespace OpenSim.Framework
            return null;
        }
    }
 }
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index 20d30b5..131ae50 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -33,7 +33,6 @@ using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Net;
-using System.Net.Security;
 using System.Reflection;
 using System.Text;
 using System.Web;
@@ -43,9 +42,9 @@ using System.Xml.Linq;
 using log4net;
 using Nwc.XmlRpc;
 using OpenMetaverse.StructuredData;
+using OpenSim.Framework.ServiceAuth;
 using XMLResponseHelper = OpenSim.Framework.SynchronousRestObjectRequester.XMLResponseHelper;
-using OpenSim.Framework.ServiceAuth;
 namespace OpenSim.Framework
 {
@@ -177,7 +176,7 @@ namespace OpenSim.Framework
            LogOutgoingDetail(string.Format("RESPONSE {0}: ", reqnum), input);
        }
-        public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout, bool compressed, bool rpc)
+        public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout, bool compressed, bool rpc, bool keepalive = false)
        {
            int reqnum = RequestNumber++;
@@ -198,7 +197,7 @@ namespace OpenSim.Framework
                HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
                request.Method = method;
                request.Timeout = timeout;
-                request.KeepAlive = false;
+                request.KeepAlive = keepalive;
                request.MaximumAutomaticRedirections = 10;
                request.ReadWriteTimeout = timeout / 2;
                request.Headers[OSHeaderRequestID] = reqnum.ToString();
@@ -1334,16 +1333,42 @@ namespace OpenSim.Framework
            public static TResponse LogAndDeserialize<TRequest, TResponse>(int reqnum, Stream respStream, long contentLength)
            {
                XmlSerializer deserializer = new XmlSerializer(typeof(TResponse));
                if (WebUtil.DebugLevel >= 5)
                {
-                    byte[] data = new byte[contentLength];
+                    const int blockLength = 4096;
-                    Util.ReadStream(respStream, data);
+                    byte[] dataBuffer = new byte[blockLength];
+                    int curcount;
+                    using (MemoryStream ms = new MemoryStream(4 * blockLength))
+                    {
+                        if(contentLength == -1)
+                        {
+                            while (true)
+                            {
+                                curcount = respStream.Read(dataBuffer, 0, blockLength);
+                                if (curcount <= 0)
+                                    break;
+                                ms.Write(dataBuffer, 0, curcount);
+                            }
+                        }
+                        else
+                        {
+                            int remaining = (int)contentLength;
+                            while (remaining > 0)
+                            {
+                                curcount = respStream.Read(dataBuffer, 0, remaining);
+                                if (curcount <= 0)
+                                    throw new EndOfStreamException(String.Format("End of stream reached with {0} bytes left to read", remaining));
+                                ms.Write(dataBuffer, 0, curcount);
+                                remaining -= curcount;
+                            }
+                        }
-                    WebUtil.LogResponseDetail(reqnum, System.Text.Encoding.UTF8.GetString(data));
+                        dataBuffer = ms.ToArray();
+                        WebUtil.LogResponseDetail(reqnum, System.Text.Encoding.UTF8.GetString(dataBuffer));
-                    using (MemoryStream temp = new MemoryStream(data))
+                        ms.Position = 0;
-                        return (TResponse)deserializer.Deserialize(temp);
+                        return (TResponse)deserializer.Deserialize(ms);
+                    }
                }
                else
                {
@@ -1427,6 +1452,5 @@ namespace OpenSim.Framework
                }
            }
        }
    }
 }