151 files changed, 6548 insertions, 2604 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 0d053e4..5a9eeb5 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Framework
        public bool child;
        /// <summary>
-        /// Number given to the client when they log-in that they provide 
+        /// Number given to the client when they log-in that they provide
        /// as credentials to the UDP server
        /// </summary>
        public uint circuitcode;
@@ -184,7 +184,7 @@ namespace OpenSim.Framework
        /// Pack AgentCircuitData into an OSDMap for transmission over LLSD XML or LLSD json
        /// </summary>
        /// <returns>map of the agent circuit data</returns>
-        public OSDMap PackAgentCircuitData()
+        public OSDMap PackAgentCircuitData(EntityTransferContext ctx)
        {
            OSDMap args = new OSDMap();
            args["agent_id"] = OSD.FromUUID(AgentID);
@@ -224,7 +224,7 @@ namespace OpenSim.Framework
            {
                args["appearance_serial"] = OSD.FromInteger(Appearance.Serial);
-                OSDMap appmap = Appearance.Pack();
+                OSDMap appmap = Appearance.Pack(ctx);
                args["packed_appearance"] = appmap;
            }
@@ -328,7 +328,7 @@ namespace OpenSim.Framework
                Vector3.TryParse(args["start_pos"].AsString(), out startpos);
            //m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos);
-            
            try
            {
                // Unpack various appearance elements
@@ -353,7 +353,7 @@ namespace OpenSim.Framework
            {
                m_log.ErrorFormat("[AGENTCIRCUITDATA] failed to unpack appearance; {0}",e.Message);
            }
-            
            ServiceURLs = new Dictionary<string, object>();
            // Try parse the new way, OSDMap
            if (args.ContainsKey("serviceurls") && args["serviceurls"] != null && (args["serviceurls"]).Type == OSDType.Map)
diff --git a/OpenSim/Framework/AgentUpdateArgs.cs b/OpenSim/Framework/AgentUpdateArgs.cs
index 660bc32..f04d692 100644
--- a/OpenSim/Framework/AgentUpdateArgs.cs
+++ b/OpenSim/Framework/AgentUpdateArgs.cs
@@ -81,6 +81,8 @@ namespace OpenSim.Framework
        public Vector3 ClientAgentPosition;
        public bool UseClientAgentPosition;
+        public bool NeedsCameraCollision;
+        public uint lastpacketSequence;
        public AgentUpdateArgs()
        {
diff --git a/OpenSim/Framework/AnimationSet.cs b/OpenSim/Framework/AnimationSet.cs
new file mode 100644
index 0000000..8753088
--- /dev/null
+++ b/OpenSim/Framework/AnimationSet.cs
@@ -0,0 +1,186 @@
+/*
+ * 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.Collections.Generic;
+using OpenMetaverse;
+namespace OpenSim.Framework
+{
+//    public delegate bool AnimationSetValidator(UUID animID);
+    public delegate uint AnimationSetValidator(UUID animID);
+    public class AnimationSet
+    {
+        private bool m_parseError = false;
+        public const uint createBasePermitions = (uint)(PermissionMask.All); // no export ?
+        public const uint createNextPermitions = (uint)(PermissionMask.Copy | PermissionMask.Modify);
+        public const uint allowedBasePermitions = (uint)(PermissionMask.Copy | PermissionMask.Modify);
+        public const uint allowedNextPermitions = 0;
+        public static void setCreateItemPermitions(InventoryItemBase it)
+        {
+            if (it == null)
+                return;
+            it.BasePermissions = createBasePermitions;
+            it.CurrentPermissions = createBasePermitions;
+            //            it.GroupPermissions &= allowedPermitions;
+            it.NextPermissions = createNextPermitions;
+            //            it.EveryOnePermissions &= allowedPermitions;
+            it.GroupPermissions = 0;
+            it.EveryOnePermissions = 0;
+        }
+        public static void enforceItemPermitions(InventoryItemBase it, bool IsCreator)
+        {
+            if (it == null)
+                return;
+            uint bp;
+            uint np;
+            if (IsCreator)
+            {
+                bp = createBasePermitions;
+                np = createNextPermitions;
+            }
+            else
+            {
+                bp = allowedBasePermitions;
+                np = allowedNextPermitions;
+            }
+            it.BasePermissions &= bp;
+            it.CurrentPermissions &= bp;
+            //            it.GroupPermissions &= allowedPermitions;
+            it.NextPermissions &= np;
+            //            it.EveryOnePermissions &= allowedPermitions;
+            it.GroupPermissions = 0;
+            it.EveryOnePermissions = 0;
+        }
+        public int AnimationCount { get; private set; }
+        private Dictionary<string, KeyValuePair<string, UUID>> m_animations = new Dictionary<string, KeyValuePair<string, UUID>>();
+        public UUID GetAnimation(string index)
+        {
+            KeyValuePair<string, UUID> val;
+            if (m_animations.TryGetValue(index, out val))
+                return val.Value;
+            return UUID.Zero;
+        }
+        public string GetAnimationName(string index)
+        {
+            KeyValuePair<string, UUID> val;
+            if (m_animations.TryGetValue(index, out val))
+                return val.Key;
+            return String.Empty;
+        }
+        public void SetAnimation(string index, string name, UUID anim)
+        {
+            if (anim == UUID.Zero)
+            {
+                m_animations.Remove(index);
+                return;
+            }
+            m_animations[index] = new KeyValuePair<string, UUID>(name, anim);
+        }
+        public AnimationSet(Byte[] data)
+        {
+            string assetData = System.Text.Encoding.ASCII.GetString(data);
+            Console.WriteLine("--------------------");
+            Console.WriteLine("AnimationSet length {0} bytes", assetData.Length);
+            Console.WriteLine(assetData);
+            Console.WriteLine("--------------------");
+        }
+        public Byte[] ToBytes()
+        {
+            // If there was an error parsing the input, we give back an
+            // empty set rather than the original data.
+            if (m_parseError)
+            {
+                string dummy = "version 1\ncount 0\n";
+                return System.Text.Encoding.ASCII.GetBytes(dummy);
+            }
+            string assetData = String.Format("version 1\ncount {0}\n", m_animations.Count);
+            foreach (KeyValuePair<string, KeyValuePair<string, UUID>> kvp in m_animations)
+                assetData += String.Format("{0} {1} {2}\n", kvp.Key, kvp.Value.Value.ToString(), kvp.Value.Key);
+            return System.Text.Encoding.ASCII.GetBytes(assetData);
+        }
+/*
+        public bool Validate(AnimationSetValidator val)
+        {
+            if (m_parseError)
+                return false;
+            List<string> badAnims = new List<string>();
+            bool allOk = true;
+            foreach (KeyValuePair<string, KeyValuePair<string, UUID>> kvp in m_animations)
+            {
+                if (!val(kvp.Value.Value))
+                {
+                    allOk = false;
+                    badAnims.Add(kvp.Key);
+                }
+            }
+            foreach (string idx in badAnims)
+                m_animations.Remove(idx);
+            return allOk;
+        }
+*/
+        public uint Validate(AnimationSetValidator val)
+        {
+            if (m_parseError)
+                return 0;
+            uint ret = 0x7fffffff;
+            uint t;
+            foreach (KeyValuePair<string, KeyValuePair<string, UUID>> kvp in m_animations)
+            {
+                t = val(kvp.Value.Value);
+                if (t == 0)
+                    return 0;
+                ret &= t;
+            }
+            return ret;
+        }
+    }
+}
diff --git a/OpenSim/Framework/AssemblyInfo.cs b/OpenSim/Framework/AssemblyInfo.cs
index a797424..c4835be 100644
--- a/OpenSim/Framework/AssemblyInfo.cs
+++ b/OpenSim/Framework/AssemblyInfo.cs
@@ -59,4 +59,4 @@ using System.Runtime.InteropServices;
 //      Revision
 //
-[assembly : AssemblyVersion("0.8.2.*")]
+[assembly : AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 2f04d2e..88edf2f 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -63,6 +63,8 @@ namespace OpenSim.Framework
        /// </summary>
        private AssetMetadata m_metadata;
+        private int m_uploadAttempts;
        // This is needed for .NET serialization!!!
        // Do NOT "Optimize" away!
        public AssetBase()
@@ -110,7 +112,7 @@ namespace OpenSim.Framework
        {
            get
            {
-                return 
+                return
                    IsTextualAsset && (
                    Type != (sbyte)AssetType.Notecard
                    && Type != (sbyte)AssetType.CallingCard
@@ -135,7 +137,7 @@ namespace OpenSim.Framework
        {
            get
            {
-                return 
+                return
                    (Type == (sbyte)AssetType.Animation ||
                     Type == (sbyte)AssetType.Gesture ||
                     Type == (sbyte)AssetType.Simstate ||
@@ -148,11 +150,12 @@ namespace OpenSim.Framework
                     Type == (sbyte)AssetType.Folder ||
                     Type == (sbyte)AssetType.ImageJPEG ||
                     Type == (sbyte)AssetType.ImageTGA ||
-                     Type == (sbyte)AssetType.LSLBytecode);
+                     Type == (sbyte)AssetType.Mesh ||
+                     Type == (sbyte) AssetType.LSLBytecode);
            }
        }
-        public virtual byte[] Data
+        public byte[] Data
        {
            get { return m_data; }
            set { m_data = value; }
@@ -197,6 +200,12 @@ namespace OpenSim.Framework
            set { m_metadata.Type = value; }
        }
+        public int UploadAttempts
+        {
+            get { return m_uploadAttempts; }
+            set { m_uploadAttempts = value; }
+        }
        /// <summary>
        /// Is this a region only asset, or does this exist on the asset server also
        /// </summary>
@@ -273,7 +282,7 @@ namespace OpenSim.Framework
                return m_id;
            }
-            
            set
            {
                UUID uuid = UUID.Zero;
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs b/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs
index 76df564..b6ea077 100644
--- a/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/AssetLoader/Filesystem/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Framework.AssetLoader.Filesystem")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
+// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from 
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
@@ -25,9 +25,9 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.3.*")]
+[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
diff --git a/OpenSim/Framework/AssetRequestToClient.cs b/OpenSim/Framework/AssetRequestToClient.cs
index d602c1f..3dfbb91 100644
--- a/OpenSim/Framework/AssetRequestToClient.cs
+++ b/OpenSim/Framework/AssetRequestToClient.cs
@@ -31,10 +31,10 @@ namespace OpenSim.Framework
 {
    /// <summary>
    /// This class was created to refactor OutPacket out of AssetCache
-    /// There is a conflict between 
+    /// There is a conflict between
    /// OpenSim.Framework.Communications.Cache.AssetRequest and OpenSim.Framework.AssetRequest
-    /// and unifying them results in a prebuild chicken and egg problem with OpenSim.Framework requiring 
+    /// and unifying them results in a prebuild chicken and egg problem with OpenSim.Framework requiring
-    /// OpenSim.Framework.Communications.Cache while OpenSim.Framework.Communications.Cache 
+    /// OpenSim.Framework.Communications.Cache while OpenSim.Framework.Communications.Cache
    /// requiring OpenSim.Framework
    /// </summary>
    public class AssetRequestToClient
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 26dd5df..77a7621 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -53,7 +53,11 @@ namespace OpenSim.Framework
        // should be only used as initial default value ( V1 viewers )
        public readonly static int VISUALPARAM_COUNT = 218;
-        public readonly static int TEXTURE_COUNT = 21;
+//        public readonly static int TEXTURE_COUNT = 21
+        // 21 bad, make it be updated as libovm gets update
+        // also keeping in sync with it
+        public readonly static int TEXTURE_COUNT = Primitive.TextureEntry.MAX_FACES;
        public readonly static byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 };
        protected int m_serial = 0;
@@ -69,8 +73,6 @@ namespace OpenSim.Framework
        protected WearableCacheItem[] m_cacheitems;
        protected bool m_cacheItemsDirty = true;
-        public bool PackLegacyWearables {get; set; }
        public virtual int Serial
        {
            get { return m_serial; }
@@ -119,7 +121,7 @@ namespace OpenSim.Framework
            get { return m_avatarHeight; }
            set { m_avatarHeight = value; }
        }
-        
        public virtual WearableCacheItem[] WearableCacheItems
        {
            get { return m_cacheitems; }
@@ -135,7 +137,7 @@ namespace OpenSim.Framework
        public AvatarAppearance()
        {
 //            m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance");
-            PackLegacyWearables = false;
            m_serial = 0;
            SetDefaultWearables();
            SetDefaultTexture();
@@ -181,11 +183,16 @@ namespace OpenSim.Framework
            m_attachments = new Dictionary<int, List<AvatarAttachment>>();
        }
-        public AvatarAppearance(AvatarAppearance appearance) : this(appearance, true)
+        public AvatarAppearance(AvatarAppearance appearance): this(appearance, true,true)
        {
        }
        public AvatarAppearance(AvatarAppearance appearance, bool copyWearables)
+            : this(appearance, copyWearables, true)
+        {
+        }
+        public AvatarAppearance(AvatarAppearance appearance, bool copyWearables, bool copyBaked)
        {
 //            m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance");
@@ -204,24 +211,29 @@ namespace OpenSim.Framework
            m_serial = appearance.Serial;
-            m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
-            for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
-                m_wearables[i] = new AvatarWearable();
            if (copyWearables && (appearance.Wearables != null))
            {
-                int len = appearance.Wearables.Length;
+                m_wearables = new AvatarWearable[appearance.Wearables.Length];
-                if(len > AvatarWearable.MAX_WEARABLES)
+                for (int i = 0; i < appearance.Wearables.Length; i++)
-                    len = AvatarWearable.MAX_WEARABLES;
+                {
-                for (int i = 0; i < len; i++)
+                    m_wearables[i] = new AvatarWearable();
-                    SetWearable(i,appearance.Wearables[i]);
+                    AvatarWearable wearable = appearance.Wearables[i];
+                    for (int j = 0; j < wearable.Count; j++)
+                            m_wearables[i].Add(wearable[j].ItemID, wearable[j].AssetID);
+                 }
            }
+            else
+                ClearWearables();
            m_texture = null;
            if (appearance.Texture != null)
            {
                byte[] tbytes = appearance.Texture.GetBytes();
                m_texture = new Primitive.TextureEntry(tbytes,0,tbytes.Length);
+                if (copyBaked && appearance.m_cacheitems != null)
+                    m_cacheitems = (WearableCacheItem[])appearance.m_cacheitems.Clone();
+                else
+                    m_cacheitems = null;
            }
            m_visualparams = null;
@@ -239,9 +251,17 @@ namespace OpenSim.Framework
        public void GetAssetsFrom(AvatarAppearance app)
        {
-            for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
+            int len =  m_wearables.Length;
+            if(len > app.m_wearables.Length)
+                len = app.m_wearables.Length;
+            for (int i = 0; i < len; i++)
            {
-                for (int j = 0; j < m_wearables[i].Count; j++)
+                int count =  m_wearables[i].Count;
+                if(count > app.m_wearables[i].Count)
+                    count = app.m_wearables[i].Count;
+                for (int j = 0; j < count; j++)
                {
                    UUID itemID = m_wearables[i][j].ItemID;
                    UUID assetID = app.Wearables[i].GetAsset(itemID);
@@ -254,8 +274,8 @@ namespace OpenSim.Framework
        public void ClearWearables()
        {
-            m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
+            m_wearables = new AvatarWearable[AvatarWearable.LEGACY_VERSION_MAX_WEARABLES];
-            for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
+            for (int i = 0; i < AvatarWearable.LEGACY_VERSION_MAX_WEARABLES; i++)
                m_wearables[i] = new AvatarWearable();
        }
@@ -271,18 +291,18 @@ namespace OpenSim.Framework
        public virtual void ResetAppearance()
        {
 //            m_log.WarnFormat("[AVATAR APPEARANCE]: Reset appearance");
-            
            m_serial = 0;
            SetDefaultTexture();
-            
            //for (int i = 0; i < BAKE_INDICES.Length; i++)
            // {
            //     int idx = BAKE_INDICES[i];
            //     m_texture.FaceTextures[idx].TextureID = UUID.Zero;
            // }
        }
-        
        protected virtual void SetDefaultParams()
        {
            m_visualparams = new byte[] { 33,61,85,23,58,127,63,85,63,42,0,85,63,36,85,95,153,63,34,0,63,109,88,132,63,136,81,85,103,136,127,0,150,150,150,127,0,0,0,0,0,127,0,0,255,127,114,127,99,63,127,140,127,127,0,0,0,191,0,104,0,0,0,0,0,0,0,0,0,145,216,133,0,127,0,127,170,0,0,127,127,109,85,127,127,63,85,42,150,150,150,150,150,150,150,25,150,150,150,0,127,0,0,144,85,127,132,127,85,0,127,127,127,127,127,127,59,127,85,127,127,106,47,79,127,127,204,2,141,66,0,0,127,127,0,0,0,0,127,0,159,0,0,178,127,36,85,131,127,127,127,153,95,0,140,75,27,127,127,0,150,150,198,0,0,63,30,127,165,209,198,127,127,153,204,51,51,255,255,255,204,0,255,150,150,150,150,150,150,150,150,150,150,0,150,150,150,150,150,0,127,127,150,150,150,150,150,150,150,150,0,0,150,51,132,150,150,150 };
@@ -299,14 +319,14 @@ namespace OpenSim.Framework
        public virtual void ResetBakedTextures()
        {
            SetDefaultTexture();
-            
            //for (int i = 0; i < BAKE_INDICES.Length; i++)
            // {
            //     int idx = BAKE_INDICES[i];
            //     m_texture.FaceTextures[idx].TextureID = UUID.Zero;
            // }
        }
-        
        protected virtual void SetDefaultTexture()
        {
            m_texture = new Primitive.TextureEntry(new UUID(AppearanceManager.DEFAULT_AVATAR_TEXTURE));
@@ -351,7 +371,7 @@ namespace OpenSim.Framework
            }
            m_texture = textureEntry;
-            
            return changed;
        }
@@ -462,12 +482,16 @@ namespace OpenSim.Framework
 // DEBUG ON
 //          m_log.WarnFormat("[AVATARAPPEARANCE] set wearable {0} --> {1}:{2}",wearableId,wearable.ItemID,wearable.AssetID);
 // DEBUG OFF
+            if (wearableId >= m_wearables.Length)
+            {
+                int currentLength = m_wearables.Length;
+                Array.Resize(ref m_wearables, wearableId + 1);
+                for (int i = currentLength ; i < m_wearables.Length ; i++)
+                    m_wearables[i] = new AvatarWearable();
+            }
            m_wearables[wearableId].Clear();
-                int count = wearable.Count;
+            for (int i = 0; i < wearable.Count; i++)
-                if (count > AvatarWearable.MAX_WEARABLES)
+                m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
-                    count = AvatarWearable.MAX_WEARABLES;
-                for (int i = 0; i < count; i++)
-                    m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
        }
 // DEBUG ON
@@ -507,14 +531,14 @@ namespace OpenSim.Framework
        {
            lock (m_attachments)
            {
-                                List<AvatarAttachment> alist = new List<AvatarAttachment>();
+                List<AvatarAttachment> alist = new List<AvatarAttachment>();
                foreach (KeyValuePair<int, List<AvatarAttachment>> kvp in m_attachments)
                {
                    foreach (AvatarAttachment attach in kvp.Value)
                        alist.Add(new AvatarAttachment(attach));
                }
-                                return alist;
+                return alist;
-                        }
+            }
        }
        internal void AppendAttachment(AvatarAttachment attach)
@@ -527,7 +551,7 @@ namespace OpenSim.Framework
            {
                if (!m_attachments.ContainsKey(attach.AttachPoint))
                    m_attachments[attach.AttachPoint] = new List<AvatarAttachment>();
-    
                foreach (AvatarAttachment prev in m_attachments[attach.AttachPoint])
                {
                    if (prev.ItemID == attach.ItemID)
@@ -584,7 +608,7 @@ namespace OpenSim.Framework
                        m_attachments.Remove(attachpoint);
                        return true;
                    }
-                    
                    return false;
                }
@@ -598,13 +622,13 @@ namespace OpenSim.Framework
                if (existingAttachment != null)
                {
 //                    m_log.DebugFormat(
-//                        "[AVATAR APPEARANCE]: Found existing attachment for {0}, asset {1} at point {2}", 
+//                        "[AVATAR APPEARANCE]: Found existing attachment for {0}, asset {1} at point {2}",
 //                        existingAttachment.ItemID, existingAttachment.AssetID, existingAttachment.AttachPoint);
                    if (existingAttachment.AssetID != UUID.Zero && existingAttachment.AttachPoint == (attachpoint & 0x7F))
                    {
                        m_log.DebugFormat(
-                            "[AVATAR APPEARANCE]: Ignoring attempt to attach an already attached item {0} at point {1}", 
+                            "[AVATAR APPEARANCE]: Ignoring attempt to attach an already attached item {0} at point {1}",
                            item, attachpoint);
                        return false;
@@ -616,7 +640,7 @@ namespace OpenSim.Framework
                        DetachAttachment(existingAttachment.ItemID);
                    }
                }
-                
                // check if this is an append or a replace, 0x80 marks it as an append
                if ((attachpoint & 0x80) > 0)
                {
@@ -677,16 +701,16 @@ namespace OpenSim.Framework
                    if (index >= 0)
                    {
 //                        m_log.DebugFormat(
-//                            "[AVATAR APPEARANCE]: Detaching attachment {0}, index {1}, point {2}", 
+//                            "[AVATAR APPEARANCE]: Detaching attachment {0}, index {1}, point {2}",
 //                            m_attachments[kvp.Key][index].ItemID, index, m_attachments[kvp.Key][index].AttachPoint);
                        // Remove it from the list of attachments at that attach point
                        m_attachments[kvp.Key].RemoveAt(index);
-    
                        // And remove the list if there are no more attachments here
                        if (m_attachments[kvp.Key].Count == 0)
                            m_attachments.Remove(kvp.Key);
-    
                        return true;
                    }
                }
@@ -706,7 +730,7 @@ namespace OpenSim.Framework
        /// <summary>
        /// Create an OSDMap from the appearance data
        /// </summary>
-        public OSDMap Pack()
+        public OSDMap Pack(EntityTransferContext ctx)
        {
            OSDMap data = new OSDMap();
@@ -714,16 +738,22 @@ namespace OpenSim.Framework
            data["height"] = OSD.FromReal(m_avatarHeight);
            // Wearables
+            //
+            // This will send as many or as few wearables as we have, unless a count
+            // is given. Used for legacy (pre 0.4) versions.
+            int count = ctx.WearablesCount;
+            if (ctx.WearablesCount == -1)
+                count = m_wearables.Length;
+            OSDArray wears = new OSDArray(count);
+            for (int i = 0; i < count; i++)
+            {
+                AvatarWearable dummyWearable = new AvatarWearable();
-            int wearsCount;
+                if (i < m_wearables.Length)
-            if(PackLegacyWearables)
+                    wears.Add(m_wearables[i].Pack());
-                wearsCount = AvatarWearable.LEGACY_VERSION_MAX_WEARABLES;
+                else
-            else
+                    wears.Add(dummyWearable.Pack());
-                wearsCount = AvatarWearable.MAX_WEARABLES;
+            }
-            OSDArray wears = new OSDArray(wearsCount);
-            for (int i = 0; i < wearsCount; i++)
-                wears.Add(m_wearables[i].Pack());
            data["wearables"] = wears;
            // Avatar Textures
@@ -737,6 +767,13 @@ namespace OpenSim.Framework
            }
            data["textures"] = textures;
+            if (m_cacheitems != null)
+            {
+                OSDArray baked = WearableCacheItem.BakedToOSD(m_cacheitems);
+                if (baked != null)
+                    data["bakedcache"] = baked;
+            }
            // Visual Parameters
            OSDBinary visualparams = new OSDBinary(m_visualparams);
            data["visualparams"] = visualparams;
@@ -774,8 +811,8 @@ namespace OpenSim.Framework
                    OSDArray wears = (OSDArray)(data["wearables"]);
                    int count = wears.Count;
-                    if (count > AvatarWearable.MAX_WEARABLES)
-                        count = AvatarWearable.MAX_WEARABLES;
+                    m_wearables = new AvatarWearable[count];
                    for (int i = 0; i < count; i++)
                        m_wearables[i] = new AvatarWearable((OSDArray)wears[i]);
@@ -803,6 +840,12 @@ namespace OpenSim.Framework
                    m_log.Warn("[AVATAR APPEARANCE]: failed to unpack textures");
                }
+                if ((data != null) && (data["bakedcache"] != null) && (data["bakedcache"]).Type == OSDType.Array)
+                {
+                    OSDArray bakedOSDArray = (OSDArray)(data["bakedcache"]);
+                    m_cacheitems = WearableCacheItem.BakedFromOSD(bakedOSDArray);
+                }
                // Visual Parameters
                SetDefaultParams();
                if ((data != null) && (data["visualparams"] != null))
@@ -824,7 +867,7 @@ namespace OpenSim.Framework
                    {
                        AvatarAttachment att = new AvatarAttachment((OSDMap)attachs[i]);
                        AppendAttachment(att);
-                        
 //                        m_log.DebugFormat(
 //                            "[AVATAR APPEARANCE]: Unpacked attachment itemID {0}, assetID {1}, point {2}",
 //                            att.ItemID, att.AssetID, att.AttachPoint);
@@ -1601,14 +1644,14 @@ namespace OpenSim.Framework
            SHAPE_EYELID_INNER_CORNER_UP = 214,
            SKIRT_SKIRT_RED = 215,
            SKIRT_SKIRT_GREEN = 216,
-            SKIRT_SKIRT_BLUE = 217, 
+            SKIRT_SKIRT_BLUE = 217,
            /// <summary>
            /// Avatar Physics section.  These are 0 type visual params which get transmitted.
            /// </summary>
            /// <summary>
-            /// Breast Part 1 
+            /// Breast Part 1
            /// </summary>
            BREAST_PHYSICS_MASS = 218,
            BREAST_PHYSICS_GRAVITY = 219,
@@ -1652,7 +1695,12 @@ namespace OpenSim.Framework
            BREAST_PHYSICS_LEFTRIGHT_MAX_EFFECT = 247,
            BREAST_PHYSICS_LEFTRIGHT_SPRING= 248,
            BREAST_PHYSICS_LEFTRIGHT_GAIN = 249,
-            BREAST_PHYSICS_LEFTRIGHT_DAMPING = 250
+            BREAST_PHYSICS_LEFTRIGHT_DAMPING = 250,
+            // Ubit: 07/96/2013 new parameters
+            _APPEARANCEMESSAGE_VERSION = 251,    //ID 11000
+            SHAPE_HOVER = 252,    //ID 11001
        }
        #endregion
    }
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index e7615f2..0e8f960 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -62,12 +62,16 @@ namespace OpenSim.Framework
        public static readonly int UNDERSHIRT = 10;
        public static readonly int UNDERPANTS = 11;
        public static readonly int SKIRT = 12;
+        public static readonly int MAX_BASICWEARABLES = 13;
        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 readonly int PHYSICS = 15;
-        public static readonly int MAX_WEARABLES = 16;
+//        public static int MAX_WEARABLES = 16;
        public static readonly UUID DEFAULT_BODY_ITEM = new UUID("66c41e39-38f9-f75a-024e-585989bfaba9");
        public static readonly UUID DEFAULT_BODY_ASSET = new UUID("66c41e39-38f9-f75a-024e-585989bfab73");
@@ -78,6 +82,9 @@ namespace OpenSim.Framework
        public static readonly UUID DEFAULT_SKIN_ITEM = new UUID("77c41e39-38f9-f75a-024e-585989bfabc9");
        public static readonly UUID DEFAULT_SKIN_ASSET = new UUID("77c41e39-38f9-f75a-024e-585989bbabbb");
+        public static readonly UUID DEFAULT_EYES_ITEM = new UUID("cdc31054-eed8-4021-994f-4e0c6e861b50");
+        public static readonly UUID DEFAULT_EYES_ASSET = new UUID("4bb6fa4d-1cd2-498a-a84c-95c1a0e745a7");
        public static readonly UUID DEFAULT_SHIRT_ITEM = new UUID("77c41e39-38f9-f75a-0000-585989bf0000");
        public static readonly UUID DEFAULT_SHIRT_ASSET = new UUID("00000000-38f9-1111-024e-222222111110");
@@ -89,7 +96,7 @@ namespace OpenSim.Framework
 //        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");
- 
        protected Dictionary<UUID, UUID> m_items = new Dictionary<UUID, UUID>();
        protected List<UUID> m_ids = new List<UUID>();
@@ -221,33 +228,40 @@ namespace OpenSim.Framework
        {
            get
            {
-                AvatarWearable[] defaultWearables = new AvatarWearable[MAX_WEARABLES]; //should be 15 of these
+                // We use the legacy count here because this is just a fallback anyway
-                for (int i = 0; i < MAX_WEARABLES; i++)
+                AvatarWearable[] defaultWearables = new AvatarWearable[LEGACY_VERSION_MAX_WEARABLES];
+                for (int i = 0; i < LEGACY_VERSION_MAX_WEARABLES; i++)
                {
                    defaultWearables[i] = new AvatarWearable();
                }
-                
                // Body
                defaultWearables[BODY].Add(DEFAULT_BODY_ITEM, DEFAULT_BODY_ASSET);
-                
                // Hair
                defaultWearables[HAIR].Add(DEFAULT_HAIR_ITEM, DEFAULT_HAIR_ASSET);
                // Skin
                defaultWearables[SKIN].Add(DEFAULT_SKIN_ITEM, DEFAULT_SKIN_ASSET);
+                // Eyes
+                defaultWearables[EYES].Add(DEFAULT_EYES_ITEM, DEFAULT_EYES_ASSET);
                // Shirt
                defaultWearables[SHIRT].Add(DEFAULT_SHIRT_ITEM, DEFAULT_SHIRT_ASSET);
                // Pants
                defaultWearables[PANTS].Add(DEFAULT_PANTS_ITEM, DEFAULT_PANTS_ASSET);
-                
 //                // Alpha
 //                defaultWearables[ALPHA].Add(DEFAULT_ALPHA_ITEM, DEFAULT_ALPHA_ASSET);
-                
-//                // Tattoo
+                //                // Tattoo
-//                defaultWearables[TATTOO].Add(DEFAULT_TATTOO_ITEM, DEFAULT_TATTOO_ASSET);
+                //                defaultWearables[TATTOO].Add(DEFAULT_TATTOO_ITEM, DEFAULT_TATTOO_ASSET);
-                
+                //                // Physics
+                //                defaultWearables[PHYSICS].Add(DEFAULT_TATTOO_ITEM, DEFAULT_TATTOO_ASSET);
                return defaultWearables;
            }
        }
diff --git a/OpenSim/Framework/BasicDOSProtector.cs b/OpenSim/Framework/BasicDOSProtector.cs
index 89bfa94..f1ff18f 100644
--- a/OpenSim/Framework/BasicDOSProtector.cs
+++ b/OpenSim/Framework/BasicDOSProtector.cs
@@ -31,7 +31,7 @@ using log4net;
 namespace OpenSim.Framework
 {
-   
    public class BasicDOSProtector
    {
        public enum ThrottleAction
@@ -43,7 +43,7 @@ namespace OpenSim.Framework
        private readonly BasicDosProtectorOptions _options;
        private readonly Dictionary<string, CircularBuffer<int>> _deeperInspection;   // per client request checker
        private readonly Dictionary<string, int> _tempBlocked;  // blocked list
-        private readonly Dictionary<string, int> _sessions; 
+        private readonly Dictionary<string, int> _sessions;
        private readonly System.Timers.Timer _forgetTimer;  // Cleanup timer
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private readonly System.Threading.ReaderWriterLockSlim _blockLockSlim = new System.Threading.ReaderWriterLockSlim();
@@ -133,7 +133,7 @@ namespace OpenSim.Framework
                else
                    throw new System.Security.SecurityException("Throttled");
            }
-           
            _blockLockSlim.ExitReadLock();
            lock (_generalRequestTimes)
@@ -169,10 +169,10 @@ namespace OpenSim.Framework
                        _blockLockSlim.ExitWriteLock();
                    }
-                    
                }
-                else 
+                else
                    ProcessConcurrency(key, endpoint);
            }
            if (_generalRequestTimes.Size == _generalRequestTimes.Capacity &&
@@ -194,7 +194,7 @@ namespace OpenSim.Framework
            _sessionLockSlim.EnterWriteLock();
            if (_sessions.ContainsKey(key))
                _sessions[key] = _sessions[key] + 1;
-            else 
+            else
                _sessions.Add(key,1);
            _sessionLockSlim.ExitWriteLock();
        }
@@ -209,7 +209,7 @@ namespace OpenSim.Framework
            }
            else
                _sessions.Add(key, 1);
-           
            _sessionLockSlim.ExitWriteLock();
        }
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index d11ad11..2461049 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -65,7 +65,7 @@ namespace OpenSim.Framework
                if (m_pqueue.Count > 0)
                    return m_pqueue.Dequeue();
-                
                if (m_queue.Count > 0)
                    return m_queue.Dequeue();
                return default(T);
@@ -76,10 +76,10 @@ namespace OpenSim.Framework
        {
            lock (m_queueSync)
            {
-                bool success = true;
+                if (m_queue.Count < 1 && m_pqueue.Count < 1)
-                while (m_queue.Count < 1 && m_pqueue.Count < 1 && success)
                {
-                    success = Monitor.Wait(m_queueSync, msTimeout);
+                    if(!Monitor.Wait(m_queueSync, msTimeout))
+                        return default(T);
                }
                if (m_pqueue.Count > 0)
diff --git a/OpenSim/Framework/Cache.cs b/OpenSim/Framework/Cache.cs
index 31cab4a..3ca85d7 100644
--- a/OpenSim/Framework/Cache.cs
+++ b/OpenSim/Framework/Cache.cs
@@ -89,14 +89,14 @@ namespace OpenSim.Framework
        public CacheItemBase(string index)
        {
            uuid = index;
-            entered = DateTime.Now;
+            entered = DateTime.UtcNow;
            lastUsed = entered;
        }
        public CacheItemBase(string index, DateTime ttl)
        {
            uuid = index;
-            entered = DateTime.Now;
+            entered = DateTime.UtcNow;
            lastUsed = entered;
            expires = ttl;
        }
@@ -215,6 +215,8 @@ namespace OpenSim.Framework
        private CacheFlags m_Flags = 0;
        private int m_Size = 1024;
        private TimeSpan m_DefaultTTL = new TimeSpan(0);
+        private DateTime m_nextExpire;
+        private TimeSpan m_expiresTime = new TimeSpan(0,0,30);
        public ExpireDelegate OnExpire;
        // Comparison interfaces
@@ -233,6 +235,21 @@ namespace OpenSim.Framework
                return(a.lastUsed.CompareTo(b.lastUsed));
            }
        }
+        // same as above, reverse order
+        private class SortLRUrev : IComparer<CacheItemBase>
+        {
+            public int Compare(CacheItemBase a, CacheItemBase b)
+            {
+                if (a == null && b == null)
+                    return 0;
+                if (a == null)
+                    return -1;
+                if (b == null)
+                    return 1;
+                return(b.lastUsed.CompareTo(a.lastUsed));
+            }
+        }
        // Convenience constructors
        //
@@ -241,6 +258,8 @@ namespace OpenSim.Framework
            m_Strategy = CacheStrategy.Balanced;
            m_Medium = CacheMedium.Memory;
            m_Flags = 0;
+            m_nextExpire = DateTime.UtcNow + m_expiresTime;
+            m_Strategy = CacheStrategy.Aggressive;
        }
        public Cache(CacheMedium medium) :
@@ -295,19 +314,23 @@ namespace OpenSim.Framework
        {
            lock (m_Index)
            {
-                if (Count <= Size)
+                int target = newSize;
-                    return;
+                if(m_Strategy == CacheStrategy.Aggressive)
+                    target = (int)(newSize * 0.9);
-                m_Index.Sort(new SortLRU());
+                if(Count > target)
-                m_Index.Reverse();
+                {
+                    m_Index.Sort(new SortLRUrev());
-                m_Index.RemoveRange(newSize, Count - newSize);
+                    m_Index.RemoveRange(newSize, Count - target);
-                m_Size = newSize;
-                m_Lookup.Clear();
+                    m_Lookup.Clear();
+                    foreach (CacheItemBase item in m_Index)
+                        m_Lookup[item.uuid] = item;
+                }
+                m_Size = newSize;
-                foreach (CacheItemBase item in m_Index)
-                    m_Lookup[item.uuid] = item;
            }
        }
@@ -333,10 +356,10 @@ namespace OpenSim.Framework
                    Expire(true);
                    return null;
                }
-    
                item.hits++;
-                item.lastUsed = DateTime.Now;
+                item.lastUsed = DateTime.UtcNow;
-    
                Expire(true);
            }
@@ -361,14 +384,15 @@ namespace OpenSim.Framework
        //
        public virtual Object Get(string index, FetchDelegate fetch)
        {
-            Object item = Get(index);
+            CacheItemBase item = GetItem(index);
            if (item != null)
-                return item;
+                return item.Retrieve();
            Object data = fetch(index);
            if (data == null)
            {
-                if ((m_Flags & CacheFlags.CacheMissing) != 0)
+                if((m_Flags & CacheFlags.CacheMissing) != 0)
                {
                    lock (m_Index)
                    {
@@ -384,7 +408,6 @@ namespace OpenSim.Framework
            }
            Store(index, data);
            return data;
        }
@@ -442,9 +465,9 @@ namespace OpenSim.Framework
                        item = GetItem(index);
                        item.hits++;
-                        item.lastUsed = DateTime.Now;
+                        item.lastUsed = DateTime.UtcNow;
                        if (m_DefaultTTL.Ticks != 0)
-                            item.expires = DateTime.Now + m_DefaultTTL;
+                            item.expires = DateTime.UtcNow + m_DefaultTTL;
                        item.Store(data);
                    }
@@ -455,7 +478,7 @@ namespace OpenSim.Framework
                        parameters);
                if (m_DefaultTTL.Ticks != 0)
-                    item.expires = DateTime.Now + m_DefaultTTL;
+                    item.expires = DateTime.UtcNow + m_DefaultTTL;
                m_Index.Add(item);
                m_Lookup[index] = item;
@@ -476,10 +499,14 @@ namespace OpenSim.Framework
            if (getting && (m_Strategy == CacheStrategy.Aggressive))
                return;
+            DateTime now = DateTime.UtcNow;
+            if(now < m_nextExpire)
+                return;
+            m_nextExpire = now + m_expiresTime;
            if (m_DefaultTTL.Ticks != 0)
            {
-                DateTime now= DateTime.Now;
                foreach (CacheItemBase item in new List<CacheItemBase>(m_Index))
                {
                    if (item.expires.Ticks == 0 ||
@@ -494,15 +521,13 @@ namespace OpenSim.Framework
            switch (m_Strategy)
            {
                case CacheStrategy.Aggressive:
-                    if (Count < Size)
+                    int target = (int)((float)Size * 0.9);
+                    if (Count < target) // Cover ridiculous cache sizes
                        return;
-                    m_Index.Sort(new SortLRU());
+                    target = (int)((float)Size * 0.8);
-                    m_Index.Reverse();
-                    int target = (int)((float)Size * 0.9);
+                    m_Index.Sort(new SortLRUrev());
-                    if (target == Count) // Cover ridiculous cache sizes
-                        return;
                    ExpireDelegate doExpire = OnExpire;
diff --git a/OpenSim/Framework/CapsUtil.cs b/OpenSim/Framework/CapsUtil.cs
index 4baf505..020f6e2 100644
--- a/OpenSim/Framework/CapsUtil.cs
+++ b/OpenSim/Framework/CapsUtil.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Framework
        {
            return "CAPS/" + capsObjectPath + "0000/";
        }
-        
        /// <summary>
        /// Get a random CAPS object path component that will be used as the identifying part of all future CAPS requests
        /// </summary>
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 1504f21..ee5007a 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -61,8 +61,8 @@ namespace OpenSim.Framework
    {
        UUID AgentID { get; set; }
-        OSDMap Pack();
+        OSDMap Pack(EntityTransferContext ctx);
-        void Unpack(OSDMap map, IScene scene);
+        void Unpack(OSDMap map, IScene scene, EntityTransferContext ctx);
    }
    /// <summary>
@@ -89,13 +89,16 @@ namespace OpenSim.Framework
        public Vector3 AtAxis;
        public Vector3 LeftAxis;
        public Vector3 UpAxis;
+        //public int GodLevel;
+        public OSD GodData = null;
        public bool ChangedGrid;
        // This probably shouldn't be here
        public byte[] Throttles;
+        public Dictionary<ulong, string> ChildrenCapSeeds = null;
-        public OSDMap Pack()
+        public OSDMap Pack(EntityTransferContext ctx)
        {
            OSDMap args = new OSDMap();
            args["message_type"] = OSD.FromString("AgentPosition");
@@ -115,14 +118,37 @@ namespace OpenSim.Framework
            args["far"] = OSD.FromReal(Far);
            args["changed_grid"] = OSD.FromBoolean(ChangedGrid);
+            //args["god_level"] = OSD.FromString(GodLevel.ToString());
+            if(GodData != null)
+            {
+                args["god_data"] = GodData;
+                OSDMap g = (OSDMap)GodData;
+                // Set legacy value
+                // TODO: remove after 0.9 is superseded
+                if (g.ContainsKey("ViewerUiIsGod"))
+                    args["god_level"] = g["ViewerUiIsGod"].AsBoolean() ? 200 : 0;
+            }
            if ((Throttles != null) && (Throttles.Length > 0))
                args["throttles"] = OSD.FromBinary(Throttles);
+            if (ChildrenCapSeeds != null && ChildrenCapSeeds.Count > 0)
+            {
+                OSDArray childrenSeeds = new OSDArray(ChildrenCapSeeds.Count);
+                foreach (KeyValuePair<ulong, string> kvp in ChildrenCapSeeds)
+                {
+                    OSDMap pair = new OSDMap();
+                    pair["handle"] = OSD.FromString(kvp.Key.ToString());
+                    pair["seed"] = OSD.FromString(kvp.Value);
+                    childrenSeeds.Add(pair);
+                }
+                args["children_seeds"] = childrenSeeds;
+            }
            return args;
        }
-        public void Unpack(OSDMap args, IScene scene)
+        public void Unpack(OSDMap args, IScene scene, EntityTransferContext ctx)
        {
            if (args.ContainsKey("region_handle"))
                UInt64.TryParse(args["region_handle"].AsString(), out RegionHandle);
@@ -160,11 +186,40 @@ namespace OpenSim.Framework
            if (args["changed_grid"] != null)
                ChangedGrid = args["changed_grid"].AsBoolean();
+            //if (args["god_level"] != null)
+            //    Int32.TryParse(args["god_level"].AsString(), out GodLevel);
+            if (args.ContainsKey("god_data") && args["god_data"] != null)
+                GodData = args["god_data"];
            if (args["far"] != null)
                Far = (float)(args["far"].AsReal());
            if (args["throttles"] != null)
                Throttles = args["throttles"].AsBinary();
+            if (args.ContainsKey("children_seeds") && (args["children_seeds"] != null) &&
+                            (args["children_seeds"].Type == OSDType.Array))
+            {
+                OSDArray childrenSeeds = (OSDArray)(args["children_seeds"]);
+                ChildrenCapSeeds = new Dictionary<ulong, string>();
+                foreach (OSD o in childrenSeeds)
+                {
+                    if (o.Type == OSDType.Map)
+                    {
+                        ulong handle = 0;
+                        string seed = "";
+                        OSDMap pair = (OSDMap)o;
+                        if (pair["handle"] != null)
+                            if (!UInt64.TryParse(pair["handle"].AsString(), out handle))
+                                continue;
+                        if (pair["seed"] != null)
+                            seed = pair["seed"].AsString();
+                        if (!ChildrenCapSeeds.ContainsKey(handle))
+                            ChildrenCapSeeds.Add(handle, seed);
+                    }
+                }
+            }
        }
        /// <summary>
@@ -294,7 +349,7 @@ namespace OpenSim.Framework
        public Vector3 UpAxis;
        /// <summary>
-        /// Signal on a V2 teleport that Scene.IncomingChildAgentDataUpdate(AgentData ad) should wait for the 
+        /// Signal on a V2 teleport that Scene.IncomingChildAgentDataUpdate(AgentData ad) should wait for the
        /// scene presence to become root (triggered when the viewer sends a CompleteAgentMovement UDP packet after
        /// establishing the connection triggered by it's receipt of a TeleportFinish EQ message).
        /// </summary>
@@ -310,18 +365,24 @@ namespace OpenSim.Framework
        public Quaternion BodyRotation;
        public uint ControlFlags;
        public float EnergyLevel;
-        public Byte GodLevel;
+        public OSD GodData = null;
+        //public Byte GodLevel;
        public bool AlwaysRun;
        public UUID PreyAgent;
        public Byte AgentAccess;
        public UUID ActiveGroupID;
+        public string ActiveGroupName;
+        public string ActiveGroupTitle = null;
+        public UUID agentCOF;
+        public byte CrossingFlags;
+        public byte CrossExtraFlags;
-        public AgentGroupData[] Groups;
+        public Dictionary<ulong, string> ChildrenCapSeeds = null;
        public Animation[] Anims;
        public Animation DefaultAnim = null;
        public Animation AnimState = null;
+        public Byte MotionState = 0;
-        public UUID GranterID;
        public UUID ParentPart;
        public Vector3 SitOffset;
@@ -334,12 +395,6 @@ namespace OpenSim.Framework
                MethodBase.GetCurrentMethod().DeclaringType);
 // DEBUG OFF
-/*
-        public byte[] AgentTextures;
-        public byte[] VisualParams;
-        public UUID[] Wearables;
-        public AvatarAttachment[] Attachments;
-*/
        // Scripted
        public ControllerData[] Controllers;
@@ -349,7 +404,9 @@ namespace OpenSim.Framework
        public List<ISceneObject> AttachmentObjects;
        public List<string> AttachmentObjectStates;
-        public virtual OSDMap Pack()
+        public Dictionary<string, UUID> MovementAnimationOverRides = new Dictionary<string, UUID>();
+        public virtual OSDMap Pack(EntityTransferContext ctx)
        {
 //            m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Pack data");
@@ -384,19 +441,39 @@ namespace OpenSim.Framework
            args["control_flags"] = OSD.FromString(ControlFlags.ToString());
            args["energy_level"] = OSD.FromReal(EnergyLevel);
-            args["god_level"] = OSD.FromString(GodLevel.ToString());
+            //args["god_level"] = OSD.FromString(GodLevel.ToString());
+            if(GodData != null)
+            {
+                args["god_data"] = GodData;
+                OSDMap g = (OSDMap)GodData;
+                if (g.ContainsKey("ViewerUiIsGod"))
+                    args["god_level"] = g["ViewerUiIsGod"].AsBoolean() ? 200 : 0;;
+            }
            args["always_run"] = OSD.FromBoolean(AlwaysRun);
            args["prey_agent"] = OSD.FromUUID(PreyAgent);
            args["agent_access"] = OSD.FromString(AgentAccess.ToString());
+            args["agent_cof"] = OSD.FromUUID(agentCOF);
+            args["crossingflags"] = OSD.FromInteger(CrossingFlags);
+            if(CrossingFlags != 0)
+                args["crossExtraFlags"] = OSD.FromInteger(CrossExtraFlags);
            args["active_group_id"] = OSD.FromUUID(ActiveGroupID);
-          
+            args["active_group_name"] = OSD.FromString(ActiveGroupName);
-            if ((Groups != null) && (Groups.Length > 0))
+            if(ActiveGroupTitle != null)
+                args["active_group_title"] = OSD.FromString(ActiveGroupTitle);
+            if (ChildrenCapSeeds != null && ChildrenCapSeeds.Count > 0)
            {
-                OSDArray groups = new OSDArray(Groups.Length);
+                OSDArray childrenSeeds = new OSDArray(ChildrenCapSeeds.Count);
-                foreach (AgentGroupData agd in Groups)
+                foreach (KeyValuePair<ulong, string> kvp in ChildrenCapSeeds)
-                    groups.Add(agd.PackUpdateMessage());
+                {
-                args["groups"] = groups;
+                    OSDMap pair = new OSDMap();
+                    pair["handle"] = OSD.FromString(kvp.Key.ToString());
+                    pair["seed"] = OSD.FromString(kvp.Value);
+                    childrenSeeds.Add(pair);
+                }
+                args["children_seeds"] = childrenSeeds;
            }
            if ((Anims != null) && (Anims.Length > 0))
@@ -417,57 +494,28 @@ namespace OpenSim.Framework
                args["animation_state"] = AnimState.PackUpdateMessage();
            }
-            if (Appearance != null)
+            if (MovementAnimationOverRides.Count > 0)
-                args["packed_appearance"] = Appearance.Pack();
-            //if ((AgentTextures != null) && (AgentTextures.Length > 0))
-            //{
-            //    OSDArray textures = new OSDArray(AgentTextures.Length);
-            //    foreach (UUID uuid in AgentTextures)
-            //        textures.Add(OSD.FromUUID(uuid));
-            //    args["agent_textures"] = textures;
-            //}
-            // The code to pack textures, visuals, wearables and attachments
-            // should be removed; packed appearance contains the full appearance
-            // This is retained for backward compatibility only
-            if (Appearance.Texture != null)
            {
-                byte[] rawtextures = Appearance.Texture.GetBytes();
+                OSDArray AOs = new OSDArray(MovementAnimationOverRides.Count);
-                args["texture_entry"] = OSD.FromBinary(rawtextures);
+                {
+                    foreach (KeyValuePair<string, UUID> kvp in MovementAnimationOverRides)
+                    {
+                        OSDMap ao = new OSDMap(2);
+                        ao["state"] = OSD.FromString(kvp.Key);
+                        ao["uuid"] = OSD.FromUUID(kvp.Value);
+                        AOs.Add(ao);
+                    }
+                }
+                args["movementAO"] = AOs;
            }
-            if ((Appearance.VisualParams != null) && (Appearance.VisualParams.Length > 0))
+            if (MotionState != 0)
-                args["visual_params"] = OSD.FromBinary(Appearance.VisualParams);
-            // We might not pass this in all cases...
-            if ((Appearance.Wearables != null) && (Appearance.Wearables.Length > 0))
            {
-                int wearsCount;
+                args["motion_state"] = OSD.FromInteger(MotionState);
-                if(Appearance.PackLegacyWearables)
-                    wearsCount = AvatarWearable.LEGACY_VERSION_MAX_WEARABLES;
-                else
-                    wearsCount = AvatarWearable.MAX_WEARABLES;
-                if(wearsCount > Appearance.Wearables.Length)
-                    wearsCount = Appearance.Wearables.Length;
-                OSDArray wears = new OSDArray(wearsCount);
-                for(int i = 0; i < wearsCount ; i++)
-                    wears.Add(Appearance.Wearables[i].Pack());
-                args["wearables"] = wears;
            }
-            List<AvatarAttachment> attachments = Appearance.GetAttachments();
+            if (Appearance != null)
-            if ((attachments != null) && (attachments.Count > 0))
+                args["packed_appearance"] = Appearance.Pack(ctx);
-            {
-                OSDArray attachs = new OSDArray(attachments.Count);
-                foreach (AvatarAttachment att in attachments)
-                    attachs.Add(att.Pack());
-                args["attachments"] = attachs;
-            }
-            // End of code to remove
            if ((Controllers != null) && (Controllers.Length > 0))
            {
@@ -516,7 +564,7 @@ namespace OpenSim.Framework
        /// Avoiding reflection makes it painful to write, but that's the price!
        /// </summary>
        /// <param name="hash"></param>
-        public virtual void Unpack(OSDMap args, IScene scene)
+        public virtual void Unpack(OSDMap args, IScene scene, EntityTransferContext ctx)
        {
            //m_log.InfoFormat("[CHILDAGENTDATAUPDATE] Unpack data");
@@ -580,8 +628,11 @@ namespace OpenSim.Framework
            if (args["energy_level"] != null)
                EnergyLevel = (float)(args["energy_level"].AsReal());
-            if (args["god_level"] != null)
+            //if (args["god_level"] != null)
-                Byte.TryParse(args["god_level"].AsString(), out GodLevel);
+            //    Byte.TryParse(args["god_level"].AsString(), out GodLevel);
+            if (args.ContainsKey("god_data") && args["god_data"] != null)
+                GodData = args["god_data"];
            if (args["always_run"] != null)
                AlwaysRun = args["always_run"].AsBoolean();
@@ -592,19 +643,46 @@ namespace OpenSim.Framework
            if (args["agent_access"] != null)
                Byte.TryParse(args["agent_access"].AsString(), out AgentAccess);
-            if (args["active_group_id"] != null)
+            if (args.ContainsKey("agent_cof") && args["agent_cof"] != null)
+                agentCOF = args["agent_cof"].AsUUID();
+            if (args.ContainsKey("crossingflags") && args["crossingflags"] != null)
+                CrossingFlags = (byte)args["crossingflags"].AsInteger();
+            if(CrossingFlags != 0)
+            {
+                if (args.ContainsKey("crossExtraFlags") && args["crossExtraFlags"] != null)
+                    CrossExtraFlags = (byte)args["crossExtraFlags"].AsInteger();
+            }
+            if (args.ContainsKey("active_group_id") && args["active_group_id"] != null)
                ActiveGroupID = args["active_group_id"].AsUUID();
-            if ((args["groups"] != null) && (args["groups"]).Type == OSDType.Array)
+            if (args.ContainsKey("active_group_name") && args["active_group_name"] != null)
+                ActiveGroupName = args["active_group_name"].AsString();
+            if(args.ContainsKey("active_group_title") && args["active_group_title"] != null)
+                ActiveGroupTitle = args["active_group_title"].AsString();
+            if (args.ContainsKey("children_seeds") && (args["children_seeds"] != null) &&
+                            (args["children_seeds"].Type == OSDType.Array))
            {
-                OSDArray groups = (OSDArray)(args["groups"]);
+                OSDArray childrenSeeds = (OSDArray)(args["children_seeds"]);
-                Groups = new AgentGroupData[groups.Count];
+                ChildrenCapSeeds = new Dictionary<ulong, string>();
-                int i = 0;
+                foreach (OSD o in childrenSeeds)
-                foreach (OSD o in groups)
                {
                    if (o.Type == OSDType.Map)
                    {
-                        Groups[i++] = new AgentGroupData((OSDMap)o);
+                        ulong handle = 0;
+                        string seed = "";
+                        OSDMap pair = (OSDMap)o;
+                        if (pair["handle"] != null)
+                            if (!UInt64.TryParse(pair["handle"].AsString(), out handle))
+                                continue;
+                        if (pair["seed"] != null)
+                            seed = pair["seed"].AsString();
+                        if (!ChildrenCapSeeds.ContainsKey(handle))
+                            ChildrenCapSeeds.Add(handle, seed);
                    }
                }
            }
@@ -647,6 +725,28 @@ namespace OpenSim.Framework
                }
            }
+            MovementAnimationOverRides.Clear();
+            if (args["movementAO"] != null && args["movementAO"].Type == OSDType.Array)
+            {
+                OSDArray AOs = (OSDArray)(args["movementAO"]);
+                int count = AOs.Count;
+                for (int i = 0; i < count; i++)
+                {
+                    OSDMap ao = (OSDMap)AOs[i];
+                    if (ao["state"] != null && ao["uuid"] != null)
+                    {
+                        string state = ao["state"].AsString();
+                        UUID id = ao["uuid"].AsUUID();
+                        MovementAnimationOverRides[state] = id;
+                    }
+                }
+            }
+            if (args.ContainsKey("motion_state"))
+                MotionState = (byte)args["motion_state"].AsInteger();
            //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
            //{
            //    OSDArray textures = (OSDArray)(args["agent_textures"]);
@@ -656,58 +756,67 @@ namespace OpenSim.Framework
            //        AgentTextures[i++] = o.AsUUID();
            //}
-            Appearance = new AvatarAppearance();
-            // The code to unpack textures, visuals, wearables and attachments
+            // packed_appearence should contain all appearance information
-            // should be removed; packed appearance contains the full appearance
+            if (args.ContainsKey("packed_appearance") && (args["packed_appearance"]).Type == OSDType.Map)
-            // This is retained for backward compatibility only
-            if (args["texture_entry"] != null)
            {
-                byte[] rawtextures = args["texture_entry"].AsBinary();
+                m_log.WarnFormat("[CHILDAGENTDATAUPDATE] got packed appearance");
-                Primitive.TextureEntry textures = new Primitive.TextureEntry(rawtextures,0,rawtextures.Length);
+                Appearance = new AvatarAppearance((OSDMap)args["packed_appearance"]);
-                Appearance.SetTextureEntries(textures);
            }
+            else
+            {
+                // if missing try the old pack method
+                m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance, checking old method");
-            if (args["visual_params"] != null)
+                Appearance = new AvatarAppearance();
-                Appearance.SetVisualParams(args["visual_params"].AsBinary());
-            if ((args["wearables"] != null) && (args["wearables"]).Type == OSDType.Array)
+                // The code to unpack textures, visuals, wearables and attachments
-            {
+                // should be removed; packed appearance contains the full appearance
-                OSDArray wears = (OSDArray)(args["wearables"]);
+                // This is retained for backward compatibility only
+                if (args["texture_entry"] != null)
+                {
+                    byte[] rawtextures = args["texture_entry"].AsBinary();
+                    Primitive.TextureEntry textures = new Primitive.TextureEntry(rawtextures, 0, rawtextures.Length);
+                    Appearance.SetTextureEntries(textures);
+                }
-                int count = wears.Count;
+                if (args["visual_params"] != null)
-                if (count > AvatarWearable.MAX_WEARABLES)
+                    Appearance.SetVisualParams(args["visual_params"].AsBinary());
-                    count = AvatarWearable.MAX_WEARABLES;
-                for (int i = 0; i < count / 2; i++)
+                if ((args["wearables"] != null) && (args["wearables"]).Type == OSDType.Array)
                {
-                    AvatarWearable awear = new AvatarWearable((OSDArray)wears[i]);
+                    OSDArray wears = (OSDArray)(args["wearables"]);
-                    Appearance.SetWearable(i,awear);
+                    for (int i = 0; i < wears.Count / 2; i++)
+                    {
+                        AvatarWearable awear = new AvatarWearable((OSDArray)wears[i]);
+                        Appearance.SetWearable(i, awear);
+                    }
                }
-            }
-            if ((args["attachments"] != null) && (args["attachments"]).Type == OSDType.Array)
+                if ((args["attachments"] != null) && (args["attachments"]).Type == OSDType.Array)
-            {
-                OSDArray attachs = (OSDArray)(args["attachments"]);
-                foreach (OSD o in attachs)
                {
-                    if (o.Type == OSDType.Map)
+                    OSDArray attachs = (OSDArray)(args["attachments"]);
+                    foreach (OSD o in attachs)
                    {
-                        // We know all of these must end up as attachments so we
+                        if (o.Type == OSDType.Map)
-                        // append rather than replace to ensure multiple attachments
+                        {
-                        // per point continues to work
+                            // We know all of these must end up as attachments so we
-//                        m_log.DebugFormat("[CHILDAGENTDATAUPDATE]: Appending attachments for {0}", AgentID);
+                            // append rather than replace to ensure multiple attachments
-                        Appearance.AppendAttachment(new AvatarAttachment((OSDMap)o));
+                            // per point continues to work
+                            //                        m_log.DebugFormat("[CHILDAGENTDATAUPDATE]: Appending attachments for {0}", AgentID);
+                            Appearance.AppendAttachment(new AvatarAttachment((OSDMap)o));
+                        }
                    }
                }
+                // end of code to remove
            }
-            // 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"]);
@@ -771,14 +880,14 @@ namespace OpenSim.Framework
    public class CompleteAgentData : AgentData
    {
-        public override OSDMap Pack() 
+        public override OSDMap Pack(EntityTransferContext ctx)
        {
-            return base.Pack();
+            return base.Pack(ctx);
        }
-        public override void Unpack(OSDMap map, IScene scene)
+        public override void Unpack(OSDMap map, IScene scene, EntityTransferContext ctx)
        {
-            base.Unpack(map, scene);
+            base.Unpack(map, scene, ctx);
        }
    }
 }
diff --git a/OpenSim/Framework/CircularBuffer.cs b/OpenSim/Framework/CircularBuffer.cs
index e919337..e101938 100644
--- a/OpenSim/Framework/CircularBuffer.cs
+++ b/OpenSim/Framework/CircularBuffer.cs
@@ -1,21 +1,21 @@
 /*
-Copyright (c) 2012, Alex Regueiro 
+Copyright (c) 2012, Alex Regueiro
 All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the 
+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 
+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.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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. 
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 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 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 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 
+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.Collections;
 using System.Collections.Generic;
diff --git a/OpenSim/Framework/Client/IClientIPEndpoint.cs b/OpenSim/Framework/Client/IClientIPEndpoint.cs
index 2b99bf0..2194616 100644
--- a/OpenSim/Framework/Client/IClientIPEndpoint.cs
+++ b/OpenSim/Framework/Client/IClientIPEndpoint.cs
@@ -34,6 +34,6 @@ namespace OpenSim.Framework.Client
 {
    public interface IClientIPEndpoint
    {
-        IPAddress EndPoint { get; }
+        IPEndPoint  RemoteEndPoint { get; }
    }
 }
diff --git a/OpenSim/Framework/ClientInfo.cs b/OpenSim/Framework/ClientInfo.cs
index 98e4465..a1ca9bc 100644
--- a/OpenSim/Framework/ClientInfo.cs
+++ b/OpenSim/Framework/ClientInfo.cs
@@ -36,14 +36,8 @@ namespace OpenSim.Framework
        public readonly DateTime StartedTime = DateTime.Now;
        public AgentCircuitData agentcircuit = null;
-        public Dictionary<uint, byte[]> needAck;
-        public List<byte[]> out_packets = new List<byte[]>();
-        public Dictionary<uint, uint> pendingAcks = new Dictionary<uint,uint>();
        public EndPoint proxyEP;
-        public uint sequence;
-        public byte[] usecircuit;
        public EndPoint userEP;
        public int resendThrottle;
@@ -59,9 +53,5 @@ namespace OpenSim.Framework
        public int targetThrottle;
        public int maxThrottle;
-        public Dictionary<string, int> SyncRequests = new Dictionary<string,int>();
-        public Dictionary<string, int> AsyncRequests = new Dictionary<string,int>();
-        public Dictionary<string, int> GenericRequests = new Dictionary<string,int>();
    }
 }
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index baff2f4..45c54e4 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -27,10 +27,8 @@
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Net;
 using OpenMetaverse;
-using OpenMetaverse.Packets;
 namespace OpenSim.Framework
 {
@@ -76,20 +74,16 @@ namespace OpenSim.Framework
        {
            lock (m_syncRoot)
            {
-                if (m_dict1.ContainsKey(value.AgentId) || m_dict2.ContainsKey(value.RemoteEndPoint))
+                // allow self healing
-                    return false;
+//                if (m_dict1.ContainsKey(value.AgentId) || m_dict2.ContainsKey(value.RemoteEndPoint))
+//                    return false;
                m_dict1[value.AgentId] = value;
                m_dict2[value.RemoteEndPoint] = value;
-                IClientAPI[] oldArray = m_array;
+                // dict1 is the master
-                int oldLength = oldArray.Length;
+                IClientAPI[] newArray = new IClientAPI[m_dict1.Count];
+                m_dict1.Values.CopyTo(newArray, 0);
-                IClientAPI[] newArray = new IClientAPI[oldLength + 1];
-                for (int i = 0; i < oldLength; i++)
-                    newArray[i] = oldArray[i];
-                newArray[oldLength] = value;
                m_array = newArray;
            }
@@ -112,22 +106,12 @@ namespace OpenSim.Framework
                    m_dict1.Remove(key);
                    m_dict2.Remove(value.RemoteEndPoint);
-                    IClientAPI[] oldArray = m_array;
+                    IClientAPI[] newArray = new IClientAPI[m_dict1.Count];
-                    int oldLength = oldArray.Length;
+                    m_dict1.Values.CopyTo(newArray, 0);
-                    IClientAPI[] newArray = new IClientAPI[oldLength - 1];
-                    int j = 0;
-                    for (int i = 0; i < oldLength; i++)
-                    {
-                        if (oldArray[i] != value)
-                            newArray[j++] = oldArray[i];
-                    }
                    m_array = newArray;
                    return true;
                }
            }
            return false;
        }
@@ -197,25 +181,11 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Performs a given task in parallel for each of the elements in the
-        /// collection
-        /// </summary>
-        /// <param name="action">Action to perform on each element</param>
-        public void ForEach(Action<IClientAPI> action)
-        {
-            IClientAPI[] localArray = m_array;
-            Parallel.For(0, localArray.Length,
-                delegate(int i)
-                { action(localArray[i]); }
-            );
-        }
-        /// <summary>
        /// Performs a given task synchronously for each of the elements in
        /// the collection
        /// </summary>
        /// <param name="action">Action to perform on each element</param>
-        public void ForEachSync(Action<IClientAPI> action)
+        public void ForEach(Action<IClientAPI> action)
        {
            IClientAPI[] localArray = m_array;
            for (int i = 0; i < localArray.Length; i++)
diff --git a/OpenSim/Framework/CnmMemoryCache.cs b/OpenSim/Framework/CnmMemoryCache.cs
index 92af331..f996cb0 100644
--- a/OpenSim/Framework/CnmMemoryCache.cs
+++ b/OpenSim/Framework/CnmMemoryCache.cs
@@ -36,14 +36,14 @@ namespace OpenSim.Framework
    /// Cenome memory based cache to store key/value pairs (elements) limited time and/or limited size.
    /// </summary>
    /// <typeparam name="TKey">
-    /// The type of keys in the cache. 
+    /// The type of keys in the cache.
    /// </typeparam>
    /// <typeparam name="TValue">
-    /// The type of values in the dictionary. 
+    /// The type of values in the dictionary.
    /// </typeparam>
    /// <remarks>
    /// <para>
-    /// Cenome memory cache stores elements to hash table generations. When new element is being added to cache, and new size would exceed 
+    /// Cenome memory cache stores elements to hash table generations. When new element is being added to cache, and new size would exceed
    /// maximal allowed size or maximal amount of allowed element count, then elements in oldest generation are deleted. Last access time
    /// is also tracked in generation level - thus it is possible that some elements are staying in cache far beyond their expiration time.
    /// If elements in older generations are accessed through <see cref="TryGetValue"/> method, they are moved to newest generation.
@@ -176,7 +176,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class. 
+        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.
        /// </summary>
        /// <param name="maximalSize">
        /// Maximal cache size.
@@ -201,7 +201,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class. 
+        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.
        /// </summary>
        /// <param name="maximalSize">
        /// Maximal cache size.
@@ -218,7 +218,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class. 
+        /// Initializes a new instance of the <see cref="CnmMemoryCache{TKey,TValue}"/> class.
        /// </summary>
        /// <param name="maximalSize">
        /// Maximal cache size.
@@ -336,7 +336,7 @@ namespace OpenSim.Framework
        /// </summary>
        private void CheckExpired()
        {
-            // Do this only one in every m_operationsBetweenTimeChecks 
+            // Do this only one in every m_operationsBetweenTimeChecks
            // Fetching time is using several millisecons - it is better not to do all time.
            m_operationsBetweenTimeChecks--;
            if (m_operationsBetweenTimeChecks <= 0)
@@ -394,7 +394,7 @@ namespace OpenSim.Framework
                new IEnumerator<KeyValuePair<TKey, TValue>>[2];
            /// <summary>
-            /// Initializes a new instance of the <see cref="Enumerator"/> class. 
+            /// Initializes a new instance of the <see cref="Enumerator"/> class.
            /// </summary>
            /// <param name="cache">
            /// The cache.
@@ -456,7 +456,7 @@ namespace OpenSim.Framework
            /// <see langword="true"/>if the enumerator was successfully advanced to the next element; <see langword="false"/> if the enumerator has passed the end of the collection.
            /// </returns>
            /// <exception cref="T:System.InvalidOperationException">
-            /// The collection was modified after the enumerator was created. 
+            /// The collection was modified after the enumerator was created.
            /// </exception>
            /// <filterpriority>2</filterpriority>
            public bool MoveNext()
@@ -479,7 +479,7 @@ namespace OpenSim.Framework
            /// Sets the enumerator to its initial position, which is before the first element in the collection.
            /// </summary>
            /// <exception cref="T:System.InvalidOperationException">
-            /// The collection was modified after the enumerator was created. 
+            /// The collection was modified after the enumerator was created.
            /// </exception>
            /// <filterpriority>2</filterpriority>
            public void Reset()
@@ -548,7 +548,7 @@ namespace OpenSim.Framework
            private DateTime m_expirationTime1;
            /// <summary>
-            /// Index to first free element. 
+            /// Index to first free element.
            /// </summary>
            private int m_firstFreeElement;
@@ -681,8 +681,8 @@ namespace OpenSim.Framework
                /// Next element in chain.
                /// </summary>
                /// <remarks>
-                /// When element have value (something is stored to it), this is index of 
+                /// When element have value (something is stored to it), this is index of
-                /// next element with same bucket index. When element is free, this 
+                /// next element with same bucket index. When element is free, this
                /// is index of next element in free element's list.
                /// </remarks>
                public int Next;
@@ -696,7 +696,7 @@ namespace OpenSim.Framework
                public long Size;
                /// <summary>
-                /// Element's value. 
+                /// Element's value.
                /// </summary>
                /// <remarks>
                /// It is possible that this value is <see langword="null"/> even when element
@@ -812,7 +812,7 @@ namespace OpenSim.Framework
                /// true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
                /// </returns>
                /// <exception cref="InvalidOperationException">
-                /// The collection was modified after the enumerator was created. 
+                /// The collection was modified after the enumerator was created.
                /// </exception>
                public bool MoveNext()
                {
@@ -841,7 +841,7 @@ namespace OpenSim.Framework
                /// Sets the enumerator to its initial position, which is before the first element in the collection.
                /// </summary>
                /// <exception cref="InvalidOperationException">
-                /// The collection was modified after the enumerator was created. 
+                /// The collection was modified after the enumerator was created.
                /// </exception>
                /// <filterpriority>2</filterpriority>
                public void Reset()
@@ -931,7 +931,7 @@ namespace OpenSim.Framework
            /// The key to locate in the <see cref="IGeneration"/>.
            /// </param>
            /// <returns>
-            /// <see langword="true"/>if the <see cref="IGeneration"/> contains an element with the <see cref="key"/>; 
+            /// <see langword="true"/>if the <see cref="IGeneration"/> contains an element with the <see cref="key"/>;
            /// otherwise <see langword="false"/>.
            /// </returns>
            public bool Contains(int bucketIndex, TKey key)
@@ -1014,7 +1014,7 @@ namespace OpenSim.Framework
            /// </returns>
            /// <remarks>
            /// <para>
-            /// If element was already existing in generation and new element size fits to collection limits, 
+            /// If element was already existing in generation and new element size fits to collection limits,
            /// then it's value is replaced with new one and size information is updated. If element didn't
            /// exists in generation before, then generation must have empty space for a new element and
            /// size must fit generation's limits, before element is added to generation.
@@ -1070,7 +1070,7 @@ namespace OpenSim.Framework
                    if (Size - m_elements[ elementIndex ].Size + size > m_cache.m_generationMaxSize)
                    {
                        // Generation is full
-                        // Remove existing element, because generation is going to be recycled to 
+                        // Remove existing element, because generation is going to be recycled to
                        // old generation and element is stored to new generation
                        RemoveElement(bucketIndex, elementIndex, previousIndex);
                        return false;
@@ -1110,12 +1110,12 @@ namespace OpenSim.Framework
            /// <remarks>
            /// <para>
            /// If element is not found from generation then <paramref name="value"/> and <paramref name="size"/>
-            /// are set to default value (default(TValue) and 0). 
+            /// are set to default value (default(TValue) and 0).
            /// </para>
            /// </remarks>
            public bool TryGetValue(int bucketIndex, TKey key, out TValue value, out long size)
            {
-                // Find entry index, 
+                // Find entry index,
                int previousIndex;
                int elementIndex = FindElementIndex(bucketIndex, key, m_newGeneration, out previousIndex);
                if (elementIndex == -1)
@@ -1166,7 +1166,7 @@ namespace OpenSim.Framework
        /// </para>
        /// <para>
        /// There are two kind generations: "new generation" and "old generation(s)". All new elements
-        /// are added to "new generation". 
+        /// are added to "new generation".
        /// </para>
        /// </remarks>
        protected interface IGeneration : IEnumerable<KeyValuePair<TKey, TValue>>
@@ -1211,7 +1211,7 @@ namespace OpenSim.Framework
            /// The key to locate in the <see cref="IGeneration"/>.
            /// </param>
            /// <returns>
-            /// <see langword="true"/>if the <see cref="IGeneration"/> contains an element with the <see cref="key"/>; 
+            /// <see langword="true"/>if the <see cref="IGeneration"/> contains an element with the <see cref="key"/>;
            /// otherwise <see langword="false"/>.
            /// </returns>
            bool Contains(int bucketIndex, TKey key);
@@ -1259,7 +1259,7 @@ namespace OpenSim.Framework
            /// </returns>
            /// <remarks>
            /// <para>
-            /// If element was already existing in generation and new element size fits to collection limits, 
+            /// If element was already existing in generation and new element size fits to collection limits,
            /// then it's value is replaced with new one and size information is updated. If element didn't
            /// exists in generation before, then generation must have empty space for a new element and
            /// size must fit generation's limits, before element is added to generation.
@@ -1288,7 +1288,7 @@ namespace OpenSim.Framework
            /// <remarks>
            /// <para>
            /// If element is not found from generation then <paramref name="value"/> and <paramref name="size"/>
-            /// are set to default value (default(TValue) and 0). 
+            /// are set to default value (default(TValue) and 0).
            /// </para>
            /// </remarks>
            bool TryGetValue(int bucketIndex, TKey key, out TValue value, out long size);
@@ -1303,8 +1303,8 @@ namespace OpenSim.Framework
        /// </summary>
        /// <remarks>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/>
@@ -1324,13 +1324,13 @@ namespace OpenSim.Framework
        /// </value>
        /// <remarks>
        /// <para>
-        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> 
+        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
-        /// and it is not accessed through <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> method or element's value is 
+        /// and it is not accessed through <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> method or element's value is
-        /// not replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method, then it is automatically removed from the 
+        /// not replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method, then it is automatically removed from the
        /// <see cref="ICnmCache{TKey,TValue}"/>.
        /// </para>
        /// <para>
-        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time, 
+        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time,
        /// because total size or count of elements stored to cache is larger than <see cref="ICnmCache{TKey,TValue}.MaxSize"/> or <see cref="ICnmCache{TKey,TValue}.MaxCount"/>.
        /// </para>
        /// <para>
@@ -1375,17 +1375,17 @@ namespace OpenSim.Framework
        /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting count of elements.
        /// </summary>
        /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited; 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited;
-        /// otherwise, <see langword="false"/>. 
+        /// otherwise, <see langword="false"/>.
        /// </value>
        /// <remarks>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.Count"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/> 
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
        public bool IsCountLimited
@@ -1397,13 +1397,13 @@ namespace OpenSim.Framework
        /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting size of elements.
        /// </summary>
        /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited; 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited;
-        /// otherwise, <see langword="false"/>. 
+        /// otherwise, <see langword="false"/>.
        /// </value>
        /// <remarks>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -1420,12 +1420,12 @@ namespace OpenSim.Framework
        /// Gets a value indicating whether or not access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe).
        /// </summary>
        /// <value>
-        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe); 
+        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe);
-        /// otherwise, <see langword="false"/>. 
+        /// otherwise, <see langword="false"/>.
        /// </value>
        /// <remarks>
        /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use
        /// <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> in <see cref="CnmSynchronizedCache{TKey,TValue}"/> class
        /// to retrieve synchronized wrapper for <see cref="ICnmCache{TKey,TValue}"/> object.
        /// </para>
@@ -1441,13 +1441,13 @@ namespace OpenSim.Framework
        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
        /// </summary>
        /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements;
-        /// otherwise, <see langword="false"/>. 
+        /// otherwise, <see langword="false"/>.
        /// </value>
        /// <remarks>
        /// If <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time and element is not accessed through <see cref="ICnmCache{TKey,TValue}.Set"/>
-        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from 
+        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from
-        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
+        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may
        /// stay longer in cache.
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
@@ -1463,13 +1463,13 @@ namespace OpenSim.Framework
        /// Gets or sets maximal allowed count of elements that can be stored to <see cref="ICnmCache{TKey,TValue}"/>.
        /// </summary>
        /// <value>
-        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements; 
+        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements;
        /// otherwise maximal allowed count of elements.
        /// </value>
        /// <remarks>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        public int MaxCount
@@ -1496,7 +1496,7 @@ namespace OpenSim.Framework
        /// </value>
        /// <remarks>
        /// <para>
-        /// If element's size is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is 
+        /// If element's size is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is
        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>.
        /// </para>
        /// </remarks>
@@ -1522,8 +1522,8 @@ namespace OpenSim.Framework
        /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
        /// </para>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -1556,11 +1556,11 @@ namespace OpenSim.Framework
        /// Normally bytes, but can be any suitable unit of measure.
        /// </para>
        /// <para>
-        /// Element's size is given when element is added or replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method. 
+        /// Element's size is given when element is added or replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method.
        /// </para>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -1581,8 +1581,8 @@ namespace OpenSim.Framework
        /// </value>
        /// <remarks>
        /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/>
-        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to 
+        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to
        /// <see cref="ICnmCache{TKey,TValue}"/>.
        /// </para>
        /// </remarks>
@@ -1735,7 +1735,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to 
+        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to
        /// <see cref="ICnmCache{TKey,TValue}"/>.
        /// </summary>
        /// <param name="key">
@@ -1748,7 +1748,7 @@ namespace OpenSim.Framework
        /// The element's size. Normally bytes, but can be any suitable unit of measure.
        /// </param>
        /// <returns>
-        /// <see langword="true"/>if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>; 
+        /// <see langword="true"/>if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>;
        /// otherwise <see langword="false"/>.
        /// </returns>
        /// <exception cref="ArgumentNullException">
@@ -1759,17 +1759,17 @@ namespace OpenSim.Framework
        /// </exception>
        /// <remarks>
        /// <para>
-        /// If element's <paramref name="size"/> is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is 
+        /// If element's <paramref name="size"/> is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is
-        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is 
+        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is
-        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>. 
+        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>.
        /// </para>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
        /// </para>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
@@ -1809,15 +1809,15 @@ namespace OpenSim.Framework
        /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
        /// </summary>
        /// <returns>
-        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
+        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with
        /// the specified key; otherwise, <see langword="false"/>.
        /// </returns>
        /// <param name="key">
        /// The key whose <paramref name="value"/> to get.
        /// </param>
        /// <param name="value">
-        /// When this method returns, the value associated with the specified <paramref name="key"/>, 
+        /// When this method returns, the value associated with the specified <paramref name="key"/>,
-        /// if the <paramref name="key"/> is found; otherwise, the 
+        /// if the <paramref name="key"/> is found; otherwise, the
        /// default value for the type of the <paramref name="value"/> parameter. This parameter is passed uninitialized.
        /// </param>
        /// <exception cref="ArgumentNullException">
diff --git a/OpenSim/Framework/CnmSynchronizedCache.cs b/OpenSim/Framework/CnmSynchronizedCache.cs
index 2bafbe9..b33f4f7 100644
--- a/OpenSim/Framework/CnmSynchronizedCache.cs
+++ b/OpenSim/Framework/CnmSynchronizedCache.cs
@@ -36,10 +36,10 @@ namespace OpenSim.Framework
    /// Synchronized Cenome cache wrapper.
    /// </summary>
    /// <typeparam name="TKey">
-    /// The type of keys in the cache. 
+    /// The type of keys in the cache.
    /// </typeparam>
    /// <typeparam name="TValue">
-    /// The type of values in the cache. 
+    /// The type of values in the cache.
    /// </typeparam>
    /// <remarks>
    /// <para>
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
        private readonly object m_syncRoot;
        /// <summary>
-        /// Initializes a new instance of the <see cref="CnmSynchronizedCache{TKey,TValue}"/> class. 
+        /// Initializes a new instance of the <see cref="CnmSynchronizedCache{TKey,TValue}"/> class.
        /// Initializes a new instance of the <see cref="CnmSynchronizedCache{TKey,TValue}"/> class.
        /// </summary>
        /// <param name="cache">
@@ -73,13 +73,13 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Returns a <see cref="ICnmCache{TKey,TValue}"/> wrapper that is synchronized (thread safe). 
+        /// Returns a <see cref="ICnmCache{TKey,TValue}"/> wrapper that is synchronized (thread safe).
        /// </summary>
        /// <param name="cache">
        /// The <see cref="ICnmCache{TKey,TValue}"/> to synchronize.
        /// </param>
        /// <returns>
-        /// A <see cref="ICnmCache{TKey,TValue}"/> wrapper that is synchronized (thread safe). 
+        /// A <see cref="ICnmCache{TKey,TValue}"/> wrapper that is synchronized (thread safe).
        /// </returns>
        /// <exception cref="ArgumentNullException">
        /// <paramref name="cache"/>is null.
@@ -125,7 +125,7 @@ namespace OpenSim.Framework
            }
            /// <summary>
-            /// Finalizes an instance of the <see cref="SynchronizedEnumerator"/> class. 
+            /// Finalizes an instance of the <see cref="SynchronizedEnumerator"/> class.
            /// </summary>
            ~SynchronizedEnumerator()
            {
@@ -184,7 +184,7 @@ namespace OpenSim.Framework
            /// true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.
            /// </returns>
            /// <exception cref="InvalidOperationException">
-            /// The collection was modified after the enumerator was created. 
+            /// The collection was modified after the enumerator was created.
            /// </exception>
            public bool MoveNext()
            {
@@ -195,7 +195,7 @@ namespace OpenSim.Framework
            /// Sets the enumerator to its initial position, which is before the first element in the collection.
            /// </summary>
            /// <exception cref="InvalidOperationException">
-            /// The collection was modified after the enumerator was created. 
+            /// The collection was modified after the enumerator was created.
            /// </exception>
            public void Reset()
            {
@@ -214,8 +214,8 @@ namespace OpenSim.Framework
        /// </summary>
        /// <remarks>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/>
@@ -241,13 +241,13 @@ namespace OpenSim.Framework
        /// </value>
        /// <remarks>
        /// <para>
-        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> 
+        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
-        /// and it is not accessed through <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> method or element's value is 
+        /// and it is not accessed through <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> method or element's value is
-        /// not replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method, then it is automatically removed from the 
+        /// not replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method, then it is automatically removed from the
        /// <see cref="ICnmCache{TKey,TValue}"/>.
        /// </para>
        /// <para>
-        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time, 
+        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time,
        /// because total size or count of elements stored to cache is larger than <see cref="ICnmCache{TKey,TValue}.MaxSize"/> or <see cref="ICnmCache{TKey,TValue}.MaxCount"/>.
        /// </para>
        /// <para>
@@ -291,17 +291,17 @@ namespace OpenSim.Framework
        /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting count of elements.
        /// </summary>
        /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited; 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited;
-        /// otherwise, <see langword="false"/>. 
+        /// otherwise, <see langword="false"/>.
        /// </value>
        /// <remarks>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.Count"/>
-        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/> 
+        /// <seealso cref="ICnmCache{TKey,TValue}.MaxCount"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsTimeLimited"/>
        public bool IsCountLimited
@@ -319,13 +319,13 @@ namespace OpenSim.Framework
        /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting size of elements.
        /// </summary>
        /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited; 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited;
-        /// otherwise, <see langword="false"/>. 
+        /// otherwise, <see langword="false"/>.
        /// </value>
        /// <remarks>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -348,12 +348,12 @@ namespace OpenSim.Framework
        /// Gets a value indicating whether or not access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe).
        /// </summary>
        /// <value>
-        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe); 
+        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe);
-        /// otherwise, <see langword="false"/>. 
+        /// otherwise, <see langword="false"/>.
        /// </value>
        /// <remarks>
        /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use
        /// <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> in <see cref="CnmSynchronizedCache{TKey,TValue}"/> class
        /// to retrieve synchronized wrapper for <see cref="ICnmCache{TKey,TValue}"/> object.
        /// </para>
@@ -369,13 +369,13 @@ namespace OpenSim.Framework
        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
        /// </summary>
        /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements;
-        /// otherwise, <see langword="false"/>. 
+        /// otherwise, <see langword="false"/>.
        /// </value>
        /// <remarks>
        /// If <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time and element is not accessed through <see cref="ICnmCache{TKey,TValue}.Set"/>
-        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from 
+        /// or <see cref="ICnmCache{TKey,TValue}.TryGetValue"/> methods in <see cref="ICnmCache{TKey,TValue}.ExpirationTime"/> , then element is automatically removed from
-        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
+        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may
        /// stay longer in cache.
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.ExpirationTime"/>
@@ -397,13 +397,13 @@ namespace OpenSim.Framework
        /// Gets or sets maximal allowed count of elements that can be stored to <see cref="ICnmCache{TKey,TValue}"/>.
        /// </summary>
        /// <value>
-        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements; 
+        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements;
        /// otherwise maximal allowed count of elements.
        /// </value>
        /// <remarks>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        public int MaxCount
@@ -433,7 +433,7 @@ namespace OpenSim.Framework
        /// </value>
        /// <remarks>
        /// <para>
-        /// If element's size is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is 
+        /// If element's size is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is
        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>.
        /// </para>
        /// </remarks>
@@ -463,8 +463,8 @@ namespace OpenSim.Framework
        /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
        /// </para>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <exception cref="ArgumentOutOfRangeException">value is less than 0.</exception>
@@ -501,11 +501,11 @@ namespace OpenSim.Framework
        /// Normally bytes, but can be any suitable unit of measure.
        /// </para>
        /// <para>
-        /// Element's size is given when element is added or replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method. 
+        /// Element's size is given when element is added or replaced by <see cref="ICnmCache{TKey,TValue}.Set"/> method.
        /// </para>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.MaxElementSize"/>
@@ -532,8 +532,8 @@ namespace OpenSim.Framework
        /// </value>
        /// <remarks>
        /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/>
-        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to 
+        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to
        /// <see cref="ICnmCache{TKey,TValue}"/>.
        /// </para>
        /// </remarks>
@@ -647,7 +647,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to 
+        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to
        /// <see cref="ICnmCache{TKey,TValue}"/>.
        /// </summary>
        /// <param name="key">
@@ -660,7 +660,7 @@ namespace OpenSim.Framework
        /// The element's size. Normally bytes, but can be any suitable unit of measure.
        /// </param>
        /// <returns>
-        /// <see langword="true"/>if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>; 
+        /// <see langword="true"/>if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>;
        /// otherwise <see langword="false"/>.
        /// </returns>
        /// <exception cref="ArgumentNullException">
@@ -671,17 +671,17 @@ namespace OpenSim.Framework
        /// </exception>
        /// <remarks>
        /// <para>
-        /// If element's <paramref name="size"/> is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is 
+        /// If element's <paramref name="size"/> is larger than <see cref="ICnmCache{TKey,TValue}.MaxElementSize"/>, then element is
-        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is 
+        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is
-        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>. 
+        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>.
        /// </para>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
        /// </para>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="ICnmCache{TKey,TValue}.IsSizeLimited"/>
@@ -703,15 +703,15 @@ namespace OpenSim.Framework
        /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
        /// </summary>
        /// <returns>
-        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
+        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with
        /// the specified key; otherwise, <see langword="false"/>.
        /// </returns>
        /// <param name="key">
        /// The key whose <paramref name="value"/> to get.
        /// </param>
        /// <param name="value">
-        /// When this method returns, the value associated with the specified <paramref name="key"/>, 
+        /// When this method returns, the value associated with the specified <paramref name="key"/>,
-        /// if the <paramref name="key"/> is found; otherwise, the 
+        /// if the <paramref name="key"/> is found; otherwise, the
        /// default value for the type of the <paramref name="value"/> parameter. This parameter is passed uninitialized.
        /// </param>
        /// <exception cref="ArgumentNullException">
diff --git a/OpenSim/Framework/ColliderData.cs b/OpenSim/Framework/ColliderData.cs
index 1b7b682..00013e1 100644
--- a/OpenSim/Framework/ColliderData.cs
+++ b/OpenSim/Framework/ColliderData.cs
@@ -42,6 +42,7 @@ namespace OpenSim.Framework
        public Vector3 velVector = Vector3.Zero;
        public string nameStr = String.Empty;
        public int colliderType = 0;
+        public int linkNumber;
    }
    public class ColliderArgs : EventArgs
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
new file mode 100644
index 0000000..7afa68a
--- /dev/null
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -0,0 +1,530 @@
+/*
+ * 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.Collections.Generic;
+using System.Globalization;
+using System.Net;
+using System.Reflection;
+using System.Xml;
+using log4net;
+using OpenMetaverse;
+//using OpenSim.Framework.Console;
+namespace OpenSim.Framework
+{
+    public class ConfigurationMember
+    {
+        #region Delegates
+        public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result);
+        public delegate void ConfigurationOptionsLoad();
+        #endregion
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private int cE = 0;
+        private string configurationDescription = String.Empty;
+        private string configurationFilename = String.Empty;
+        private XmlNode configurationFromXMLNode = null;
+        private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>();
+        private IGenericConfig configurationPlugin = null;
+        /// <summary>
+        /// This is the default configuration DLL loaded
+        /// </summary>
+        private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll";
+        private ConfigurationOptionsLoad loadFunction;
+        private ConfigurationOptionResult resultFunction;
+        private bool useConsoleToPromptOnError = true;
+        public ConfigurationMember(string configuration_filename, string configuration_description,
+                                   ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error)
+        {
+            configurationFilename = configuration_filename;
+            configurationDescription = configuration_description;
+            loadFunction = load_function;
+            resultFunction = result_function;
+            useConsoleToPromptOnError = use_console_to_prompt_on_error;
+        }
+        public ConfigurationMember(XmlNode configuration_xml, string configuration_description,
+                                   ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error)
+        {
+            configurationFilename = String.Empty;
+            configurationFromXMLNode = configuration_xml;
+            configurationDescription = configuration_description;
+            loadFunction = load_function;
+            resultFunction = result_function;
+            useConsoleToPromptOnError = use_console_to_prompt_on_error;
+        }
+        public void setConfigurationFilename(string filename)
+        {
+            configurationFilename = filename;
+        }
+        public void setConfigurationDescription(string desc)
+        {
+            configurationDescription = desc;
+        }
+        public void setConfigurationResultFunction(ConfigurationOptionResult result)
+        {
+            resultFunction = result;
+        }
+        public void forceConfigurationPluginLibrary(string dll_filename)
+        {
+            configurationPluginFilename = dll_filename;
+        }
+        private void checkAndAddConfigOption(ConfigurationOption option)
+        {
+            if ((option.configurationKey != String.Empty && option.configurationQuestion != String.Empty) ||
+                (option.configurationKey != String.Empty && option.configurationUseDefaultNoPrompt))
+            {
+                if (!configurationOptions.Contains(option))
+                {
+                    configurationOptions.Add(option);
+                }
+            }
+            else
+            {
+                m_log.Info(
+                    "Required fields for adding a configuration option is invalid. Will not add this option (" +
+                    option.configurationKey + ")");
+            }
+        }
+        public void addConfigurationOption(string configuration_key,
+                                           ConfigurationOption.ConfigurationTypes configuration_type,
+                                           string configuration_question, string configuration_default,
+                                           bool use_default_no_prompt)
+        {
+            ConfigurationOption configOption = new ConfigurationOption();
+            configOption.configurationKey = configuration_key;
+            configOption.configurationQuestion = configuration_question;
+            configOption.configurationDefault = configuration_default;
+            configOption.configurationType = configuration_type;
+            configOption.configurationUseDefaultNoPrompt = use_default_no_prompt;
+            configOption.shouldIBeAsked = null; //Assumes true, I can ask whenever
+            checkAndAddConfigOption(configOption);
+        }
+        public void addConfigurationOption(string configuration_key,
+                                           ConfigurationOption.ConfigurationTypes configuration_type,
+                                           string configuration_question, string configuration_default,
+                                           bool use_default_no_prompt,
+                                           ConfigurationOption.ConfigurationOptionShouldBeAsked shouldIBeAskedDelegate)
+        {
+            ConfigurationOption configOption = new ConfigurationOption();
+            configOption.configurationKey = configuration_key;
+            configOption.configurationQuestion = configuration_question;
+            configOption.configurationDefault = configuration_default;
+            configOption.configurationType = configuration_type;
+            configOption.configurationUseDefaultNoPrompt = use_default_no_prompt;
+            configOption.shouldIBeAsked = shouldIBeAskedDelegate;
+            checkAndAddConfigOption(configOption);
+        }
+        // TEMP - REMOVE
+        public void performConfigurationRetrieve()
+        {
+            if (cE > 1)
+                m_log.Error("READING CONFIGURATION COUT: " + cE.ToString());
+            configurationPlugin = LoadConfigDll(configurationPluginFilename);
+            configurationOptions.Clear();
+            if (loadFunction == null)
+            {
+                m_log.Error("Load Function for '" + configurationDescription +
+                            "' is null. Refusing to run configuration.");
+                return;
+            }
+            if (resultFunction == null)
+            {
+                m_log.Error("Result Function for '" + configurationDescription +
+                            "' is null. Refusing to run configuration.");
+                return;
+            }
+            //m_log.Debug("[CONFIG]: Calling Configuration Load Function...");
+            loadFunction();
+            if (configurationOptions.Count <= 0)
+            {
+                m_log.Error("[CONFIG]: No configuration options were specified for '" + configurationOptions +
+                            "'. Refusing to continue configuration.");
+                return;
+            }
+            bool useFile = true;
+            if (configurationPlugin == null)
+            {
+                m_log.Error("[CONFIG]: Configuration Plugin NOT LOADED!");
+                return;
+            }
+            if (configurationFilename.Trim() != String.Empty)
+            {
+                configurationPlugin.SetFileName(configurationFilename);
+                try
+                {
+                    configurationPlugin.LoadData();
+                    useFile = true;
+                }
+                catch (XmlException e)
+                {
+                    m_log.WarnFormat("[CONFIG] Not using {0}: {1}",
+                            configurationFilename,
+                            e.Message.ToString());
+                    //m_log.Error("Error loading " + configurationFilename + ": " + e.ToString());
+                    useFile = false;
+                }
+            }
+            else
+            {
+                if (configurationFromXMLNode != null)
+                {
+                    m_log.Info("Loading from XML Node, will not save to the file");
+                    configurationPlugin.LoadDataFromString(configurationFromXMLNode.OuterXml);
+                }
+                m_log.Info("XML Configuration Filename is not valid; will not save to the file.");
+                useFile = false;
+            }
+            foreach (ConfigurationOption configOption in configurationOptions)
+            {
+                bool convertSuccess = false;
+                object return_result = null;
+                string errorMessage = String.Empty;
+                bool ignoreNextFromConfig = false;
+                while (convertSuccess == false)
+                {
+                    string console_result = String.Empty;
+                    string attribute = null;
+                    if (useFile || configurationFromXMLNode != null)
+                    {
+                        if (!ignoreNextFromConfig)
+                        {
+                            attribute = configurationPlugin.GetAttribute(configOption.configurationKey);
+                        }
+                        else
+                        {
+                            ignoreNextFromConfig = false;
+                        }
+                    }
+                    if (attribute == null)
+                    {
+                        if (configOption.configurationUseDefaultNoPrompt || useConsoleToPromptOnError == false)
+                        {
+                            console_result = configOption.configurationDefault;
+                        }
+                        else
+                        {
+                            if ((configOption.shouldIBeAsked != null &&
+                                 configOption.shouldIBeAsked(configOption.configurationKey)) ||
+                                configOption.shouldIBeAsked == null)
+                            {
+                                if (configurationDescription.Trim() != String.Empty)
+                                {
+                                    console_result =
+                                        MainConsole.Instance.CmdPrompt(
+                                            configurationDescription + ": " + configOption.configurationQuestion,
+                                            configOption.configurationDefault);
+                                }
+                                else
+                                {
+                                    console_result =
+                                        MainConsole.Instance.CmdPrompt(configOption.configurationQuestion,
+                                                                       configOption.configurationDefault);
+                                }
+                            }
+                            else
+                            {
+                                //Dont Ask! Just use default
+                                console_result = configOption.configurationDefault;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        console_result = attribute;
+                    }
+                    // if the first character is a "$", assume it's the name
+                    // of an environment variable and substitute with the value of that variable
+                    if (console_result.StartsWith("$"))
+                        console_result = Environment.GetEnvironmentVariable(console_result.Substring(1));
+                    switch (configOption.configurationType)
+                    {
+                        case ConfigurationOption.ConfigurationTypes.TYPE_STRING:
+                            return_result = console_result;
+                            convertSuccess = true;
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY:
+                            if (console_result.Length > 0)
+                            {
+                                return_result = console_result;
+                                convertSuccess = true;
+                            }
+                            errorMessage = "a string that is not empty";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN:
+                            bool boolResult;
+                            if (Boolean.TryParse(console_result, out boolResult))
+                            {
+                                convertSuccess = true;
+                                return_result = boolResult;
+                            }
+                            errorMessage = "'true' or 'false' (Boolean)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_BYTE:
+                            byte byteResult;
+                            if (Byte.TryParse(console_result, out byteResult))
+                            {
+                                convertSuccess = true;
+                                return_result = byteResult;
+                            }
+                            errorMessage = "a byte (Byte)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_CHARACTER:
+                            char charResult;
+                            if (Char.TryParse(console_result, out charResult))
+                            {
+                                convertSuccess = true;
+                                return_result = charResult;
+                            }
+                            errorMessage = "a character (Char)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_INT16:
+                            short shortResult;
+                            if (Int16.TryParse(console_result, out shortResult))
+                            {
+                                convertSuccess = true;
+                                return_result = shortResult;
+                            }
+                            errorMessage = "a signed 32 bit integer (short)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_INT32:
+                            int intResult;
+                            if (Int32.TryParse(console_result, out intResult))
+                            {
+                                convertSuccess = true;
+                                return_result = intResult;
+                            }
+                            errorMessage = "a signed 32 bit integer (int)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_INT64:
+                            long longResult;
+                            if (Int64.TryParse(console_result, out longResult))
+                            {
+                                convertSuccess = true;
+                                return_result = longResult;
+                            }
+                            errorMessage = "a signed 32 bit integer (long)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS:
+                            IPAddress ipAddressResult;
+                            if (IPAddress.TryParse(console_result, out ipAddressResult))
+                            {
+                                convertSuccess = true;
+                                return_result = ipAddressResult;
+                            }
+                            errorMessage = "an IP Address (IPAddress)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_UUID:
+                            UUID uuidResult;
+                            if (UUID.TryParse(console_result, out uuidResult))
+                            {
+                                convertSuccess = true;
+                                return_result = uuidResult;
+                            }
+                            errorMessage = "a UUID (UUID)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_UUID_NULL_FREE:
+                            UUID uuidResult2;
+                            if (UUID.TryParse(console_result, out uuidResult2))
+                            {
+                                convertSuccess = true;
+                                if (uuidResult2 == UUID.Zero)
+                                    uuidResult2 = UUID.Random();
+                                return_result = uuidResult2;
+                            }
+                            errorMessage = "a non-null UUID (UUID)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_Vector3:
+                            Vector3 vectorResult;
+                            if (Vector3.TryParse(console_result, out vectorResult))
+                            {
+                                convertSuccess = true;
+                                return_result = vectorResult;
+                            }
+                            errorMessage = "a vector (Vector3)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_UINT16:
+                            ushort ushortResult;
+                            if (UInt16.TryParse(console_result, out ushortResult))
+                            {
+                                convertSuccess = true;
+                                return_result = ushortResult;
+                            }
+                            errorMessage = "an unsigned 16 bit integer (ushort)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_UINT32:
+                            uint uintResult;
+                            if (UInt32.TryParse(console_result, out uintResult))
+                            {
+                                convertSuccess = true;
+                                return_result = uintResult;
+                            }
+                            errorMessage = "an unsigned 32 bit integer (uint)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_UINT64:
+                            ulong ulongResult;
+                            if (UInt64.TryParse(console_result, out ulongResult))
+                            {
+                                convertSuccess = true;
+                                return_result = ulongResult;
+                            }
+                            errorMessage = "an unsigned 64 bit integer (ulong)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT:
+                            float floatResult;
+                            if (
+                                float.TryParse(console_result, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, Culture.NumberFormatInfo,
+                                               out floatResult))
+                            {
+                                convertSuccess = true;
+                                return_result = floatResult;
+                            }
+                            errorMessage = "a single-precision floating point number (float)";
+                            break;
+                        case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE:
+                            double doubleResult;
+                            if (
+                                Double.TryParse(console_result, NumberStyles.AllowDecimalPoint | NumberStyles.AllowLeadingSign, Culture.NumberFormatInfo,
+                                                out doubleResult))
+                            {
+                                convertSuccess = true;
+                                return_result = doubleResult;
+                            }
+                            errorMessage = "an double-precision floating point number (double)";
+                            break;
+                    }
+                    if (convertSuccess)
+                    {
+                        if (useFile)
+                        {
+                            configurationPlugin.SetAttribute(configOption.configurationKey, console_result);
+                        }
+                        if (!resultFunction(configOption.configurationKey, return_result))
+                        {
+                            m_log.Info(
+                                "The handler for the last configuration option denied that input, please try again.");
+                            convertSuccess = false;
+                            ignoreNextFromConfig = true;
+                        }
+                    }
+                    else
+                    {
+                        if (configOption.configurationUseDefaultNoPrompt)
+                        {
+                            m_log.Error(string.Format(
+                                            "[CONFIG]: [{3}]:[{1}] is not valid default for parameter [{0}].\nThe configuration result must be parsable to {2}.\n",
+                                            configOption.configurationKey, console_result, errorMessage,
+                                            configurationFilename));
+                            convertSuccess = true;
+                        }
+                        else
+                        {
+                            m_log.Warn(string.Format(
+                                           "[CONFIG]: [{3}]:[{1}] is not a valid value [{0}].\nThe configuration result must be parsable to {2}.\n",
+                                           configOption.configurationKey, console_result, errorMessage,
+                                           configurationFilename));
+                            ignoreNextFromConfig = true;
+                        }
+                    }
+                }
+            }
+            if (useFile)
+            {
+                configurationPlugin.Commit();
+                configurationPlugin.Close();
+            }
+        }
+        private static IGenericConfig LoadConfigDll(string dllName)
+        {
+            Assembly pluginAssembly = Assembly.LoadFrom(dllName);
+            IGenericConfig plug = null;
+            foreach (Type pluginType in pluginAssembly.GetTypes())
+            {
+                if (pluginType.IsPublic)
+                {
+                    if (!pluginType.IsAbstract)
+                    {
+                        Type typeInterface = pluginType.GetInterface("IGenericConfig", true);
+                        if (typeInterface != null)
+                        {
+                            plug =
+                                (IGenericConfig) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
+                        }
+                    }
+                }
+            }
+            pluginAssembly = null;
+            return plug;
+        }
+        public void forceSetConfigurationOption(string configuration_key, string configuration_value)
+        {
+            configurationPlugin.LoadData();
+            configurationPlugin.SetAttribute(configuration_key, configuration_value);
+            configurationPlugin.Commit();
+            configurationPlugin.Close();
+        }
+    }
+}
diff --git a/OpenSim/Framework/Console/AssemblyInfo.cs b/OpenSim/Framework/Console/AssemblyInfo.cs
index 67af471..c53d92b 100644
--- a/OpenSim/Framework/Console/AssemblyInfo.cs
+++ b/OpenSim/Framework/Console/AssemblyInfo.cs
@@ -55,4 +55,4 @@ using System.Runtime.InteropServices;
 // You can specify all values by your own or you can build default build and revision
 // numbers with the '*' character (the default):
-[assembly : AssemblyVersion("0.8.2.*")]
+[assembly : AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
diff --git a/OpenSim/Framework/Console/CommandConsole.cs b/OpenSim/Framework/Console/CommandConsole.cs
index 0f68afe..52360b4 100644
--- a/OpenSim/Framework/Console/CommandConsole.cs
+++ b/OpenSim/Framework/Console/CommandConsole.cs
@@ -52,27 +52,27 @@ namespace OpenSim.Framework.Console
            /// The module from which this command comes
            /// </value>
            public string module;
-            
            /// <value>
            /// Whether the module is shared
            /// </value>
            public bool shared;
-            
            /// <value>
            /// Very short BNF description
            /// </value>
            public string help_text;
-            
            /// <value>
            /// Longer one line help text
            /// </value>
            public string long_help;
-            
            /// <value>
            /// Full descriptive help for this command
            /// </value>
            public string descriptive_help;
-            
            /// <value>
            /// The method to invoke for this command
            /// </value>
@@ -83,8 +83,8 @@ namespace OpenSim.Framework.Console
            = "To enter an argument that contains spaces, surround the argument with double quotes.\nFor example, show object name \"My long object name\"\n";
        public const string ItemHelpText
-= @"For more information, type 'help all' to get a list of all commands, 
+            = @"For more information, type 'help all' to get a list of all commands,
-  or type help <item>' where <item> is one of the following:";
+              or type help <item>' where <item> is one of the following:";
        /// <value>
        /// Commands organized by keyword in a tree
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Console
        {
            List<string> help = new List<string>();
            List<string> helpParts = new List<string>(cmd);
-            
            // Remove initial help keyword
            helpParts.RemoveAt(0);
@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Console
            return help;
        }
-        
        /// <summary>
        /// See if we can find the requested command in order to display longer help
        /// </summary>
@@ -171,23 +171,23 @@ namespace OpenSim.Framework.Console
                help.Insert(0, ItemHelpText);
                return help;
            }
-            
            Dictionary<string, object> dict = tree;
            while (helpParts.Count > 0)
            {
                string helpPart = helpParts[0];
-                
                if (!dict.ContainsKey(helpPart))
                    break;
-                
                //m_log.Debug("Found {0}", helpParts[0]);
-                
                if (dict[helpPart] is Dictionary<string, Object>)
-                    dict = (Dictionary<string, object>)dict[helpPart]; 
+                    dict = (Dictionary<string, object>)dict[helpPart];
-                
                helpParts.RemoveAt(0);
            }
-        
            // There was a command for the given help string
            if (dict.ContainsKey(String.Empty))
            {
@@ -200,14 +200,14 @@ namespace OpenSim.Framework.Console
                // If we do have some descriptive help then insert a spacing line before for readability.
                if (descriptiveHelp != string.Empty)
                    help.Add(string.Empty);
-                
                help.Add(commandInfo.descriptive_help);
            }
            else
            {
                help.Add(string.Format("No help is available for {0}", originalHelpRequest));
            }
-            
            return help;
        }
@@ -268,7 +268,7 @@ namespace OpenSim.Framework.Console
 //            }
 //            return result;
 //        }
-        
        /// <summary>
        /// Add a command to those which can be invoked from the console.
        /// </summary>
@@ -299,7 +299,7 @@ namespace OpenSim.Framework.Console
            string[] parts = Parser.Parse(command);
            Dictionary<string, Object> current = tree;
-            
            foreach (string part in parts)
            {
                if (current.ContainsKey(part))
@@ -326,7 +326,7 @@ namespace OpenSim.Framework.Console
                return;
            }
-            
            info = new CommandInfo();
            info.module = module;
            info.shared = shared;
@@ -471,7 +471,7 @@ namespace OpenSim.Framework.Console
            return null;
        }
-                
        public bool HasCommand(string command)
        {
            string[] result;
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 2d8e723..64cddea 100644..100755
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Console
        {
            System.Console.WriteLine(text);
        }
-        
        public virtual void OutputFormat(string format, params object[] components)
        {
            Output(string.Format(format, components));
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.Console
            return ret;
        }
-                
        public string CmdPrompt(string p, List<char> excludedCharacters)
        {
            bool itisdone = false;
@@ -95,7 +95,7 @@ namespace OpenSim.Framework.Console
            {
                itisdone = true;
                ret = CmdPrompt(p);
-                
                foreach (char c in excludedCharacters)
                {
                    if (ret.Contains(c.ToString()))
@@ -117,7 +117,7 @@ namespace OpenSim.Framework.Console
            {
                itisdone = true;
                ret = CmdPrompt(p, def);
-                
                if (ret == String.Empty)
                {
                    ret = def;
diff --git a/OpenSim/Framework/Console/ConsolePluginCommand.cs b/OpenSim/Framework/Console/ConsolePluginCommand.cs
index f4d3687..f4d3687 100644..100755
--- a/OpenSim/Framework/Console/ConsolePluginCommand.cs
+++ b/OpenSim/Framework/Console/ConsolePluginCommand.cs
diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs
index 44f6dc1..bfa05a2 100644
--- a/OpenSim/Framework/Console/ConsoleUtil.cs
+++ b/OpenSim/Framework/Console/ConsoleUtil.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Console
    //    private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        public const int LocalIdNotFound = 0;
-    
        /// <summary>
        /// Used by modules to display stock co-ordinate help, though possibly this should be under some general section
        /// rather than in each help summary.
@@ -57,10 +57,10 @@ namespace OpenSim.Framework.Console
    show object pos ,20,20 to ,40,40
    delete object pos ,,30 to ,,~
    show object pos ,,-~ to ,,30";
-    
        public const string MinRawConsoleVectorValue = "-~";
        public const string MaxRawConsoleVectorValue = "~";
-    
        public const string VectorSeparator = ",";
        public static char[] VectorSeparatorChars = VectorSeparator.ToCharArray();
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Console
            return true;
        }
-    
        /// <summary>
        /// Try to parse a console UUID from the console.
        /// </summary>
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Console
                return false;
            }
-    
            return true;
        }
@@ -259,7 +259,7 @@ namespace OpenSim.Framework.Console
            return false;
        }
-    
        /// <summary>
        /// Convert a minimum vector input from the console to an OpenMetaverse.Vector3
        /// </summary>
@@ -270,7 +270,7 @@ namespace OpenSim.Framework.Console
        {
            return TryParseConsoleVector(rawConsoleVector, c => float.MinValue.ToString(), out vector);
        }
-    
        /// <summary>
        /// Convert a maximum vector input from the console to an OpenMetaverse.Vector3
        /// </summary>
@@ -281,7 +281,7 @@ namespace OpenSim.Framework.Console
        {
            return TryParseConsoleVector(rawConsoleVector, c => float.MaxValue.ToString(), out vector);
        }
-    
        /// <summary>
        /// Convert a vector input from the console to an OpenMetaverse.Vector3
        /// </summary>
@@ -354,10 +354,10 @@ namespace OpenSim.Framework.Console
            string rawConsoleVector, int dimensions, Func<string, string> blankComponentFunc)
        {
            List<string> components = rawConsoleVector.Split(VectorSeparatorChars).ToList();
-    
            if (components.Count < 1 || components.Count > dimensions)
                return null;
-    
            if (components.Count < dimensions)
            {
                if (blankComponentFunc == null)
@@ -380,7 +380,7 @@ namespace OpenSim.Framework.Console
                        else
                            return c;
                    });
-    
            return string.Join(VectorSeparator, cookedComponents.ToArray());
        }
    }
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index d8f8ecc..73f0323 100644
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Console
        private const string LOGLEVEL_NONE = "(none)";
        // Used to extract categories for colourization.
-        private Regex m_categoryRegex 
+        private Regex m_categoryRegex
            = new Regex(
                @"^(?<Front>.*?)\[(?<Category>[^\]]+)\]:?(?<End>.*)", RegexOptions.Singleline | RegexOptions.Compiled);
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Console
            string m_historyFile = startupConfig.GetString("ConsoleHistoryFile", "OpenSimConsoleHistory.txt");
            int m_historySize = startupConfig.GetInt("ConsoleHistoryFileLines", 100);
-            m_historyPath = Path.GetFullPath(Path.Combine("../caches", m_historyFile));
+            m_historyPath = Path.GetFullPath(Path.Combine(Util.configDir(), m_historyFile));
            m_log.InfoFormat("[LOCAL CONSOLE]: Persistent command line history is Enabled, up to {0} lines from file {1}", m_historySize, m_historyPath);
            if (File.Exists(m_historyPath))
@@ -167,15 +167,15 @@ namespace OpenSim.Framework.Console
            {
                System.Console.CursorLeft = 0;
            }
-            else 
+            else
            {
                int bufferWidth = System.Console.BufferWidth;
-                
                // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
                if (bufferWidth > 0 && left >= bufferWidth)
                    System.Console.CursorLeft = bufferWidth - 1;
            }
-            
            if (top < 0)
            {
                top = 0;
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Console
            else
            {
                int bufferHeight = System.Console.BufferHeight;
-                
                // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
                if (bufferHeight > 0 && top >= bufferHeight)
                    top = bufferHeight - 1;
@@ -216,14 +216,14 @@ namespace OpenSim.Framework.Console
            {
                System.Console.CursorTop = 0;
            }
-            else 
+            else
            {
                int bufferHeight = System.Console.BufferHeight;
                // On Mono 2.4.2.3 (and possibly above), the buffer value is sometimes erroneously zero (Mantis 4657)
                if (bufferHeight > 0 && top >= bufferHeight)
                    System.Console.CursorTop = bufferHeight - 1;
            }
-            
            if (left < 0)
            {
                left = 0;
@@ -339,7 +339,7 @@ namespace OpenSim.Framework.Console
            string outText = text;
            if (level != LOGLEVEL_NONE)
-            {               
+            {
                MatchCollection matches = m_categoryRegex.Matches(text);
                if (matches.Count == 1)
@@ -364,7 +364,7 @@ namespace OpenSim.Framework.Console
                WriteColorText(ConsoleColor.Yellow, outText);
            else
                System.Console.Write(outText);
-        
            System.Console.WriteLine();
        }
@@ -551,7 +551,7 @@ namespace OpenSim.Framework.Console
                        }
                        string commandLine = m_commandLine.ToString();
-                        
                        if (isCommand)
                        {
                            string[] cmd = Commands.Resolve(Parser.Parse(commandLine));
@@ -573,7 +573,7 @@ namespace OpenSim.Framework.Console
                        // If we're not echoing to screen (e.g. a password) then we probably don't want it in history
                        if (m_echo && commandLine != "")
                            AddToHistory(commandLine);
-                        
                        return commandLine;
                    default:
                        break;
diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs
index 1a142df..e1ff720 100644
--- a/OpenSim/Framework/Console/MockConsole.cs
+++ b/OpenSim/Framework/Console/MockConsole.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework.Console
 {
    /// <summary>
    /// This is a Fake console that's used when setting up the Scene in Unit Tests
-    /// Don't use this except for Unit Testing or you're in for a world of hurt when the 
+    /// Don't use this except for Unit Testing or you're in for a world of hurt when the
    /// sim gets to ReadLine
    /// </summary>
    public class MockConsole : ICommandConsole
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Console
        public string ReadLine(string p, bool isCommand, bool e) { return ""; }
-        public object ConsoleScene { 
+        public object ConsoleScene {
            get { return null; }
            set {}
        }
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index 8ad7b0d..f59c902 100644
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -34,6 +34,7 @@ using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
+using System.Timers;
 using OpenMetaverse;
 using Nini.Config;
 using OpenSim.Framework.Servers.HttpServer;
@@ -41,51 +42,147 @@ using log4net;
 namespace OpenSim.Framework.Console
 {
-    public class ConsoleConnection
-    {
-        public int last;
-        public long lastLineSeen;
-        public bool newConnection = true;
-    }
    // A console that uses REST interfaces
    //
    public class RemoteConsole : CommandConsole
    {
-        private IHttpServer m_Server = null;
+        // Connection specific data, indexed by a session ID
-        private IConfigSource m_Config = null;
+        // we create when a client connects.
+        protected class ConsoleConnection
-        private List<string> m_Scrollback = new List<string>();
+        {
-        private ManualResetEvent m_DataEvent = new ManualResetEvent(false);
+            // Last activity from the client
-        private List<string> m_InputData = new List<string>();
+            public int last;
-        private long m_LineNumber = 0;
-        private Dictionary<UUID, ConsoleConnection> m_Connections =
+            // Last line of scrollback posted to this client
+            public long lastLineSeen;
+            // True if this is a new connection, e.g. has never
+            // displayed a prompt to the user.
+            public bool newConnection = true;
+        }
+        // A line in the scrollback buffer.
+        protected class ScrollbackEntry
+        {
+            // The line number of this entry
+            public long lineNumber;
+            // The text to send to the client
+            public string text;
+            // The level this should be logged as. Omitted for
+            // prompts and input echo.
+            public string level;
+            // True if the text above is a prompt, e.g. the
+            // client should turn on the cursor / accept input
+            public bool isPrompt;
+            // True if the requested input is a command. A
+            // client may offer help or validate input if
+            // this is set. If false, input should be sent
+            // as typed.
+            public bool isCommand;
+            // True if this text represents a line of text that
+            // was input in response to a prompt. A client should
+            // turn off the cursor and refrain from sending commands
+            // until a new prompt is received.
+            public bool isInput;
+        }
+        // Data that is relevant to all connections
+        // The scrollback buffer
+        protected List<ScrollbackEntry> m_Scrollback = new List<ScrollbackEntry>();
+        // Monotonously incrementing line number. This may eventually
+        // wrap. No provision is made for that case because 64 bits
+        // is a long, long time.
+        protected long m_lineNumber = 0;
+        // These two variables allow us to send the correct
+        // information about the prompt status to the client,
+        // irrespective of what may have run off the top of the
+        // scrollback buffer;
+        protected bool m_expectingInput = false;
+        protected bool m_expectingCommand = true;
+        protected string m_lastPromptUsed;
+        // This is the list of things received from clients.
+        // Note: Race conditions can happen. If a client sends
+        // something while nothing is expected, it will be
+        // intepreted as input to the next prompt. For
+        // commands this is largely correct. For other prompts,
+        // YMMV.
+        // TODO: Find a better way to fix this
+        protected List<string> m_InputData = new List<string>();
+        // Event to allow ReadLine to wait synchronously even though
+        // everthing else is asynchronous here.
+        protected ManualResetEvent m_DataEvent = new ManualResetEvent(false);
+        // The list of sessions we maintain. Unlike other console types,
+        // multiple users on the same console are explicitly allowed.
+        protected Dictionary<UUID, ConsoleConnection> m_Connections =
                new Dictionary<UUID, ConsoleConnection>();
-        private string m_UserName = String.Empty;
-        private string m_Password = String.Empty;
+        // Timer to control expiration of sessions that have been
-        private string m_AllowedOrigin = String.Empty;
+        // disconnected.
+        protected System.Timers.Timer m_expireTimer = new System.Timers.Timer(5000);
+        // The less interesting stuff that makes the actual server
+        // work.
+        protected IHttpServer m_Server = null;
+        protected IConfigSource m_Config = null;
+        protected string m_UserName = String.Empty;
+        protected string m_Password = String.Empty;
+        protected string m_AllowedOrigin = String.Empty;
        public RemoteConsole(string defaultPrompt) : base(defaultPrompt)
        {
+            // There is something wrong with this architecture.
+            // A prompt is sent on every single input, so why have this?
+            // TODO: Investigate and fix.
+            m_lastPromptUsed = defaultPrompt;
+            // Start expiration of sesssions.
+            m_expireTimer.Elapsed += DoExpire;
+            m_expireTimer.Start();
        }
        public void ReadConfig(IConfigSource config)
        {
            m_Config = config;
+            // We're pulling this from the 'Network' section for legacy
+            // compatibility. However, this is so essentially insecure
+            // that TLS and client certs should be used instead of
+            // a username / password.
            IConfig netConfig = m_Config.Configs["Network"];
            if (netConfig == null)
                return;
+            // Get the username and password.
            m_UserName = netConfig.GetString("ConsoleUser", String.Empty);
            m_Password = netConfig.GetString("ConsolePass", String.Empty);
+            // Woefully underdocumented, this is what makes javascript
+            // console clients work. Set to "*" for anywhere or (better)
+            // to specific addresses.
            m_AllowedOrigin = netConfig.GetString("ConsoleAllowedOrigin", String.Empty);
        }
        public void SetServer(IHttpServer server)
        {
+            // This is called by the framework to give us the server
+            // instance (means: port) to work with.
            m_Server = server;
+            // Add our handlers
            m_Server.AddHTTPHandler("/StartSession/", HandleHttpStartSession);
            m_Server.AddHTTPHandler("/CloseSession/", HandleHttpCloseSession);
            m_Server.AddHTTPHandler("/SessionCommand/", HandleHttpSessionCommand);
@@ -93,38 +190,84 @@ namespace OpenSim.Framework.Console
        public override void Output(string text, string level)
        {
+            Output(text, level, false, false, false);
+        }
+        protected void Output(string text, string level, bool isPrompt, bool isCommand, bool isInput)
+        {
+            // Increment the line number. It was 0 and they start at 1
+            // so we need to pre-increment.
+            m_lineNumber++;
+            // Create and populate the new entry.
+            ScrollbackEntry newEntry = new ScrollbackEntry();
+            newEntry.lineNumber = m_lineNumber;
+            newEntry.text = text;
+            newEntry.level = level;
+            newEntry.isPrompt = isPrompt;
+            newEntry.isCommand = isCommand;
+            newEntry.isInput = isInput;
+            // Add a line to the scrollback. In some cases, that may not
+            // actually be a line of text.
            lock (m_Scrollback)
            {
+                // Prune the scrollback to the length se send as connect
+                // burst to give the user some context.
                while (m_Scrollback.Count >= 1000)
                    m_Scrollback.RemoveAt(0);
-                m_LineNumber++;
-                m_Scrollback.Add(String.Format("{0}", m_LineNumber)+":"+level+":"+text);
+                m_Scrollback.Add(newEntry);
            }
+            // Let the rest of the system know we have output something.
            FireOnOutput(text.Trim());
+            // Also display it for debugging.
            System.Console.WriteLine(text.Trim());
        }
        public override void Output(string text)
        {
-            Output(text, "normal");
+            // 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
+            // is called on a dedicated console thread and
+            // needs to be synchronous. Old architecture but
+            // not worth upgrading.
            if (isCommand)
-                Output("+++"+p);
+            {
+                m_expectingInput = true;
+                m_expectingCommand = true;
+                Output(p, String.Empty, true, true, false);
+                m_lastPromptUsed = p;
+            }
            else
-                Output("-++"+p);
+            {
+                m_expectingInput = true;
+                Output(p, String.Empty, true, false, false);
+            }
+            // Here is where we wait for the user to input something.
            m_DataEvent.WaitOne();
            string cmdinput;
+            // Check for empty input. Read input if not empty.
            lock (m_InputData)
            {
                if (m_InputData.Count == 0)
                {
                    m_DataEvent.Reset();
+                    m_expectingInput = false;
+                    m_expectingCommand = false;
                    return "";
                }
@@ -135,8 +278,19 @@ namespace OpenSim.Framework.Console
            }
+            m_expectingInput = false;
+            m_expectingCommand = false;
+            // Echo to all the other users what we have done. This
+            // will also go to ourselves.
+            Output (cmdinput, String.Empty, false, false, true);
+            // If this is a command, we need to resolve and execute it.
            if (isCommand)
            {
+                // This call will actually execute the command and create
+                // any output associated with it. The core just gets an
+                // empty string so it will call again immediately.
                string[] cmd = Commands.Resolve(Parser.Parse(cmdinput));
                if (cmd.Length != 0)
@@ -151,18 +305,23 @@ namespace OpenSim.Framework.Console
                    return String.Empty;
                }
            }
+            // Return the raw input string if not a command.
            return cmdinput;
        }
-        private Hashtable CheckOrigin(Hashtable result)
+        // Very simplistic static access control header.
+        protected Hashtable CheckOrigin(Hashtable result)
        {
            if (!string.IsNullOrEmpty(m_AllowedOrigin))
                result["access_control_allow_origin"] = m_AllowedOrigin;
            return result;
        }
        /* TODO: Figure out how PollServiceHTTPHandler can access the request headers
         * in order to use m_AllowedOrigin as a regular expression
-        private Hashtable CheckOrigin(Hashtable headers, Hashtable result)
+        protected Hashtable CheckOrigin(Hashtable headers, Hashtable result)
        {
            if (!string.IsNullOrEmpty(m_AllowedOrigin))
            {
@@ -177,18 +336,23 @@ namespace OpenSim.Framework.Console
        }
        */
-        private void DoExpire()
+        protected void DoExpire(Object sender, ElapsedEventArgs e)
        {
+            // Iterate the list of console connections and find those we
+            // haven't heard from for longer then the longpoll interval.
+            // Remove them.
            List<UUID> expired = new List<UUID>();
            lock (m_Connections)
            {
+                // Mark the expired ones
                foreach (KeyValuePair<UUID, ConsoleConnection> kvp in m_Connections)
                {
                    if (System.Environment.TickCount - kvp.Value.last > 500000)
                        expired.Add(kvp.Key);
                }
+                // Delete them
                foreach (UUID id in expired)
                {
                    m_Connections.Remove(id);
@@ -197,10 +361,10 @@ namespace OpenSim.Framework.Console
            }
        }
-        private Hashtable HandleHttpStartSession(Hashtable request)
+        // Start a new session.
+        protected Hashtable HandleHttpStartSession(Hashtable request)
        {
-            DoExpire();
+            // The login is in the form of a http form post
            Hashtable post = DecodePostString(request["body"].ToString());
            Hashtable reply = new Hashtable();
@@ -208,6 +372,7 @@ namespace OpenSim.Framework.Console
            reply["int_response_code"] = 401;
            reply["content_type"] = "text/plain";
+            // Check user name and password
            if (m_UserName == String.Empty)
                return reply;
@@ -220,22 +385,28 @@ namespace OpenSim.Framework.Console
                return reply;
            }
+            // Set up the new console connection record
            ConsoleConnection c = new ConsoleConnection();
            c.last = System.Environment.TickCount;
            c.lastLineSeen = 0;
+            // Assign session ID
            UUID sessionID = UUID.Random();
+            // Add connection to list.
            lock (m_Connections)
            {
                m_Connections[sessionID] = c;
            }
+            // This call is a CAP. The URL is the authentication.
            string uri = "/ReadResponses/" + sessionID.ToString() + "/";
            m_Server.AddPollServiceHTTPHandler(
                uri, new PollServiceEventArgs(null, uri, HasEvents, GetEvents, NoEvents, sessionID,25000)); // 25 secs timeout
+            // Our reply is an XML document.
+            // TODO: Change this to Linq.Xml
            XmlDocument xmldoc = new XmlDocument();
            XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
                    "", "");
@@ -252,12 +423,13 @@ namespace OpenSim.Framework.Console
            rootElement.AppendChild(id);
            XmlElement prompt = xmldoc.CreateElement("", "Prompt", "");
-            prompt.AppendChild(xmldoc.CreateTextNode(DefaultPrompt));
+            prompt.AppendChild(xmldoc.CreateTextNode(m_lastPromptUsed));
            rootElement.AppendChild(prompt);
            rootElement.AppendChild(MainConsole.Instance.Commands.GetXml(xmldoc));
+            // Set up the response and check origin
            reply["str_response_string"] = xmldoc.InnerXml;
            reply["int_response_code"] = 200;
            reply["content_type"] = "text/xml";
@@ -266,10 +438,9 @@ namespace OpenSim.Framework.Console
            return reply;
        }
-        private Hashtable HandleHttpCloseSession(Hashtable request)
+        // Client closes session. Clean up.
+        protected Hashtable HandleHttpCloseSession(Hashtable request)
        {
-            DoExpire();
            Hashtable post = DecodePostString(request["body"].ToString());
            Hashtable reply = new Hashtable();
@@ -316,10 +487,9 @@ namespace OpenSim.Framework.Console
            return reply;
        }
-        private Hashtable HandleHttpSessionCommand(Hashtable request)
+        // Command received from the client.
+        protected Hashtable HandleHttpSessionCommand(Hashtable request)
        {
-            DoExpire();
            Hashtable post = DecodePostString(request["body"].ToString());
            Hashtable reply = new Hashtable();
@@ -327,6 +497,7 @@ namespace OpenSim.Framework.Console
            reply["int_response_code"] = 404;
            reply["content_type"] = "text/plain";
+            // Check the ID
            if (post["ID"] == null)
                return reply;
@@ -334,21 +505,25 @@ namespace OpenSim.Framework.Console
            if (!UUID.TryParse(post["ID"].ToString(), out id))
                return reply;
+            // Find the connection for that ID.
            lock (m_Connections)
            {
                if (!m_Connections.ContainsKey(id))
                    return reply;
            }
+            // Empty post. Just error out.
            if (post["COMMAND"] == null)
                return reply;
+            // Place the input data in the buffer.
            lock (m_InputData)
            {
                m_DataEvent.Set();
                m_InputData.Add(post["COMMAND"].ToString());
            }
+            // Create the XML reply document.
            XmlDocument xmldoc = new XmlDocument();
            XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
                    "", "");
@@ -372,7 +547,8 @@ namespace OpenSim.Framework.Console
            return reply;
        }
-        private Hashtable DecodePostString(string data)
+        // Decode a HTTP form post to a Hashtable
+        protected Hashtable DecodePostString(string data)
        {
            Hashtable result = new Hashtable();
@@ -389,13 +565,14 @@ namespace OpenSim.Framework.Console
                if (elems.Length > 1)
                    value = System.Web.HttpUtility.UrlDecode(elems[1]);
-                
                result[name] = value;
            }
            return result;
        }
+        // Close the CAP receiver for the responses for a given client.
        public void CloseConnection(UUID id)
        {
            try
@@ -409,7 +586,9 @@ namespace OpenSim.Framework.Console
            }
        }
-        private bool HasEvents(UUID RequestID, UUID sessionID)
+        // Check if there is anything to send. Return true if this client has
+        // lines pending.
+        protected bool HasEvents(UUID RequestID, UUID sessionID)
        {
            ConsoleConnection c = null;
@@ -420,13 +599,15 @@ namespace OpenSim.Framework.Console
                c = m_Connections[sessionID];
            }
            c.last = System.Environment.TickCount;
-            if (c.lastLineSeen < m_LineNumber)
+            if (c.lastLineSeen < m_lineNumber)
                return true;
            return false;
        }
-        private Hashtable GetEvents(UUID RequestID, UUID sessionID)
+        // Send all pending output to the client.
+        protected Hashtable GetEvents(UUID RequestID, UUID sessionID)
        {
+            // Find the connection that goes with this client.
            ConsoleConnection c = null;
            lock (m_Connections)
@@ -435,12 +616,15 @@ namespace OpenSim.Framework.Console
                    return NoEvents(RequestID, UUID.Zero);
                c = m_Connections[sessionID];
            }
+            // If we have nothing to send, send the no events response.
            c.last = System.Environment.TickCount;
-            if (c.lastLineSeen >= m_LineNumber)
+            if (c.lastLineSeen >= m_lineNumber)
                return NoEvents(RequestID, UUID.Zero);
            Hashtable result = new Hashtable();
+            // Create the response document.
            XmlDocument xmldoc = new XmlDocument();
            XmlNode xmlnode = xmldoc.CreateNode(XmlNodeType.XmlDeclaration,
                    "", "");
@@ -449,30 +633,53 @@ namespace OpenSim.Framework.Console
            XmlElement rootElement = xmldoc.CreateElement("", "ConsoleSession",
                    "");
-            if (c.newConnection)
+            //if (c.newConnection)
-            {
+            //{
-                c.newConnection = false;
+            //    c.newConnection = false;
-                Output("+++" + DefaultPrompt);
+            //    Output("+++" + DefaultPrompt);
-            }
+            //}
            lock (m_Scrollback)
            {
-                long startLine = m_LineNumber - m_Scrollback.Count;
+                long startLine = m_lineNumber - m_Scrollback.Count;
                long sendStart = startLine;
                if (sendStart < c.lastLineSeen)
                    sendStart = c.lastLineSeen;
-                for (long i = sendStart ; i < m_LineNumber ; i++)
+                for (long i = sendStart ; i < m_lineNumber ; i++)
                {
+                    ScrollbackEntry e = m_Scrollback[(int)(i - startLine)];
                    XmlElement res = xmldoc.CreateElement("", "Line", "");
-                    long line = i + 1;
+                    res.SetAttribute("Number", e.lineNumber.ToString());
-                    res.SetAttribute("Number", line.ToString());
+                    res.SetAttribute("Level", e.level);
-                    res.AppendChild(xmldoc.CreateTextNode(m_Scrollback[(int)(i - startLine)]));
+                    // Don't include these for the scrollback, we'll send the
+                    // real state later.
+                    if (!c.newConnection)
+                    {
+                        res.SetAttribute("Prompt", e.isPrompt ? "true" : "false");
+                        res.SetAttribute("Command", e.isCommand ? "true" : "false");
+                        res.SetAttribute("Input", e.isInput ? "true" : "false");
+                    }
+                    else if (i == m_lineNumber - 1) // Last line for a new connection
+                    {
+                        res.SetAttribute("Prompt", m_expectingInput ? "true" : "false");
+                        res.SetAttribute("Command", m_expectingCommand ? "true" : "false");
+                        res.SetAttribute("Input", (!m_expectingInput) ? "true" : "false");
+                    }
+                    else
+                    {
+                        res.SetAttribute("Input", e.isInput ? "true" : "false");
+                    }
+                    res.AppendChild(xmldoc.CreateTextNode(e.text));
                    rootElement.AppendChild(res);
                }
            }
-            c.lastLineSeen = m_LineNumber;
+            c.lastLineSeen = m_lineNumber;
+            c.newConnection = false;
            xmldoc.AppendChild(rootElement);
@@ -486,7 +693,9 @@ namespace OpenSim.Framework.Console
            return result;
        }
-        private Hashtable NoEvents(UUID RequestID, UUID id)
+        // This is really just a no-op. It generates what is sent
+        // to the client if the poll times out without any events.
+        protected Hashtable NoEvents(UUID RequestID, UUID id)
        {
            Hashtable result = new Hashtable();
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs
index 48478b4..209c991 100644
--- a/OpenSim/Framework/Constants.cs
+++ b/OpenSim/Framework/Constants.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework
        // 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;
+        public const uint RegionHeight = 4096;
        // This could be a parameters but, really, a region of greater than this is pretty unmanageable
        public const uint MaximumRegionSize = 8192;
@@ -46,12 +46,20 @@ namespace OpenSim.Framework
        public enum EstateAccessCodex : uint
        {
-            AccessOptions = 1,
+            AllowedAccess = 1,
            AllowedGroups = 2,
            EstateBans = 4,
            EstateManagers = 8
        }
+        public enum EstateAccessLimits : int
+        {
+            AllowedAccess = 500,
+            AllowedGroups = 63,
+            EstateBans = 500,
+            EstateManagers = 10
+        }
        [Flags]public enum TeleportFlags : uint
        {
            /// <summary>No flags set, or teleport failed</summary>
diff --git a/OpenSim/Framework/Crc32.cs b/OpenSim/Framework/Crc32.cs
new file mode 100644
index 0000000..7ad1566
--- /dev/null
+++ b/OpenSim/Framework/Crc32.cs
@@ -0,0 +1,139 @@
+/*
+ * 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.Security.Cryptography;
+namespace OpenSim.Framework
+{
+    // this is more generic than openmetaverse CRC32
+    public class Crc32 : HashAlgorithm
+    {
+        public const UInt32 DefaultPolynomial = 0xedb88320;
+        public const UInt32 DefaultSeed = 0xffffffff;
+        private UInt32 hash;
+        private UInt32 seed;
+        private UInt32[] table;
+        private static UInt32[] defaultTable;
+        public Crc32()
+        {
+            table = InitializeTable(DefaultPolynomial);
+            seed = DefaultSeed;
+            Initialize();
+        }
+        public Crc32(UInt32 polynomial, UInt32 seed)
+        {
+            table = InitializeTable(polynomial);
+            this.seed = seed;
+            Initialize();
+        }
+        public override void Initialize()
+        {
+            hash = seed;
+        }
+        protected override void HashCore(byte[] buffer, int start, int length)
+        {
+            hash = CalculateHash(table, hash, buffer, start, length);
+        }
+        protected override byte[] HashFinal()
+        {
+            byte[] hashBuffer = UInt32ToBigEndianBytes(~hash);
+            this.HashValue = hashBuffer;
+            return hashBuffer;
+        }
+        public override int HashSize
+        {
+            get { return 32; }
+        }
+        public static UInt32 Compute(byte[] buffer)
+        {
+            return ~CalculateHash(InitializeTable(DefaultPolynomial), DefaultSeed, buffer, 0, buffer.Length);
+        }
+        public static UInt32 Compute(UInt32 seed, byte[] buffer)
+        {
+            return ~CalculateHash(InitializeTable(DefaultPolynomial), seed, buffer, 0, buffer.Length);
+        }
+        public static UInt32 Compute(UInt32 polynomial, UInt32 seed, byte[] buffer)
+        {
+            return ~CalculateHash(InitializeTable(polynomial), seed, buffer, 0, buffer.Length);
+        }
+        private static UInt32[] InitializeTable(UInt32 polynomial)
+        {
+            if (polynomial == DefaultPolynomial && defaultTable != null)
+                return defaultTable;
+            UInt32[] createTable = new UInt32[256];
+            for (int i = 0; i < 256; i++)
+            {
+                UInt32 entry = (UInt32)i;
+                for (int j = 0; j < 8; j++)
+                    if ((entry & 1) == 1)
+                        entry = (entry >> 1) ^ polynomial;
+                    else
+                        entry = entry >> 1;
+                createTable[i] = entry;
+            }
+            if (polynomial == DefaultPolynomial)
+                defaultTable = createTable;
+            return createTable;
+        }
+        private static UInt32 CalculateHash(UInt32[] table, UInt32 seed, byte[] buffer, int start, int size)
+        {
+            UInt32 crc = seed;
+            for (int i = start; i < size; i++)
+                unchecked
+                {
+                    crc = (crc >> 8) ^ table[buffer[i] ^ crc & 0xff];
+                }
+            return crc;
+        }
+        private byte[] UInt32ToBigEndianBytes(UInt32 x)
+        {
+            return new byte[] {
+                    (byte)((x >> 24) & 0xff),
+                    (byte)((x >> 16) & 0xff),
+                    (byte)((x >> 8) & 0xff),
+                    (byte)(x & 0xff) };
+        }
+    }
+}
diff --git a/OpenSim/Framework/CustomTypes.cs b/OpenSim/Framework/CustomTypes.cs
new file mode 100644
index 0000000..d109c26
--- /dev/null
+++ b/OpenSim/Framework/CustomTypes.cs
@@ -0,0 +1,43 @@
+/*
+ * 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;
+namespace OpenSim.Framework
+{
+    public enum CustomAssetType : sbyte
+    {
+        CustomTypeBase = 0x60,
+        AnimationSet = 0x60,
+    }
+    public enum CustomInventoryType : sbyte
+    {
+        CustomTypeBase = 0x60,
+        AnimationSet = 0x60,
+    }
+}
diff --git a/OpenSim/Framework/DAMap.cs b/OpenSim/Framework/DAMap.cs
index 4995a92..1915fa5 100644
--- a/OpenSim/Framework/DAMap.cs
+++ b/OpenSim/Framework/DAMap.cs
@@ -63,9 +63,9 @@ namespace OpenSim.Framework
        {
            get { return m_map; }
            set { m_map = value; }
-        }        
+        }
-        
-        public XmlSchema GetSchema() { return null; } 
+        public XmlSchema GetSchema() { return null; }
        public static DAMap FromXml(string rawXml)
        {
@@ -73,19 +73,19 @@ namespace OpenSim.Framework
            map.ReadXml(rawXml);
            return map;
        }
-       
        public void ReadXml(XmlReader reader)
-        { 
+        {
-            ReadXml(reader.ReadInnerXml());            
+            ReadXml(reader.ReadInnerXml());
        }
        public void ReadXml(string rawXml)
-        {            
+        {
            // System.Console.WriteLine("Trying to deserialize [{0}]", rawXml);
-            
            lock (this)
            {
-                m_map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml);         
+                m_map = (OSDMap)OSDParser.DeserializeLLSDXml(rawXml);
                SanitiseMap(this);
            }
        }
@@ -104,7 +104,7 @@ namespace OpenSim.Framework
        public void CopyFrom(DAMap other)
        {
            // Deep copy
-            
            string data = null;
            lock (other)
            {
@@ -113,7 +113,7 @@ namespace OpenSim.Framework
                    data = OSDParser.SerializeLLSDXmlString(other.m_map);
                }
            }
-            
            lock (this)
            {
                if (data == null)
@@ -185,9 +185,9 @@ namespace OpenSim.Framework
        /// <summary>
        /// Get the number of stores.
        /// </summary>
-        public int CountStores 
+        public int CountStores
        {
-            get 
+            get
            {
                int count = 0;
@@ -263,8 +263,8 @@ namespace OpenSim.Framework
                throw new Exception("Minimum namespace length is " + MIN_NAMESPACE_LENGTH);
        }
-        public bool ContainsStore(string ns, string storeName) 
+        public bool ContainsStore(string ns, string storeName)
-        {    
+        {
            OSD namespaceOsd;
            lock (this)
@@ -276,7 +276,7 @@ namespace OpenSim.Framework
            }
            return false;
-        }     
+        }
        public bool TryGetStore(string ns, string storeName, out OSDMap store)
        {
@@ -297,17 +297,17 @@ namespace OpenSim.Framework
            store = null;
            return false;
-        }    
+        }
        public void Clear()
        {
            lock (this)
                m_map.Clear();
-        }  
+        }
        public bool RemoveStore(string ns, string storeName)
        {
-            OSD namespaceOsd; 
+            OSD namespaceOsd;
            lock (this)
            {
@@ -323,6 +323,6 @@ namespace OpenSim.Framework
            }
            return false;
-        }     
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/DOMap.cs b/OpenSim/Framework/DOMap.cs
index f5b650b..033cbf9 100644
--- a/OpenSim/Framework/DOMap.cs
+++ b/OpenSim/Framework/DOMap.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework
    public class DOMap
    {
        private IDictionary<string, object> m_map;
-        
        public void Add(string ns, string objName, object dynObj)
        {
            DAMap.ValidateNamespace(ns);
diff --git a/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs b/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
index 9056548..816523b 100644
--- a/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
+++ b/OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
@@ -55,6 +55,11 @@ namespace OpenSim.Framework
            Dictionary2 = new Dictionary<TKey2, TValue>(capacity);
        }
+        ~DoubleDictionaryThreadAbortSafe()
+        {
+            rwLock.Dispose();
+        }
        public void Add(TKey1 key1, TKey2 key2, TValue value)
        {
            bool gotLock = false;
@@ -64,31 +69,29 @@ namespace OpenSim.Framework
                // 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 {}            
+                try {}
                finally
                {
                    rwLock.EnterWriteLock();
                    gotLock = true;
+                    if (Dictionary1.ContainsKey(key1))
+                    {
+                        if (!Dictionary2.ContainsKey(key2))
+                            throw new ArgumentException("key1 exists in the dictionary but not key2");
+                    }
+                    else if (Dictionary2.ContainsKey(key2))
+                    {
+                        if (!Dictionary1.ContainsKey(key1))
+                            throw new ArgumentException("key2 exists in the dictionary but not key1");
+                    }
+                    Dictionary1[key1] = value;
+                    Dictionary2[key2] = value;
                }
-                if (Dictionary1.ContainsKey(key1))
-                {
-                    if (!Dictionary2.ContainsKey(key2))
-                        throw new ArgumentException("key1 exists in the dictionary but not key2");
-                }
-                else if (Dictionary2.ContainsKey(key2))
-                {
-                    if (!Dictionary1.ContainsKey(key1))
-                        throw new ArgumentException("key2 exists in the dictionary but not key1");
-                }
-                Dictionary1[key1] = value;
-                Dictionary2[key2] = value;
            }
-            finally 
+            finally
-            { 
+            {
                if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
            }
        }
@@ -102,20 +105,19 @@ namespace OpenSim.Framework
                // 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 {}            
+                try {}
                finally
                {
                    rwLock.EnterWriteLock();
                    gotLock = true;
+                    Dictionary1.Remove(key1);
+                    success = Dictionary2.Remove(key2);
                }
-                Dictionary1.Remove(key1);
-                success = Dictionary2.Remove(key2);
            }
-            finally 
+            finally
-            { 
+            {
                if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
            }
            return success;
@@ -131,7 +133,7 @@ namespace OpenSim.Framework
                // 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 {}            
+                try {}
                finally
                {
                    rwLock.EnterWriteLock();
@@ -146,18 +148,22 @@ namespace OpenSim.Framework
                    {
                        if (kvp.Value.Equals(value))
                        {
-                            Dictionary1.Remove(key1);
+                            try { }
-                            Dictionary2.Remove(kvp.Key);
+                            finally
+                            {
+                                Dictionary1.Remove(key1);
+                                Dictionary2.Remove(kvp.Key);
+                            }
                            found = true;
                            break;
                        }
                    }
                }
            }
-            finally 
+            finally
-            { 
+            {
                if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
            }
            return found;
@@ -173,7 +179,7 @@ namespace OpenSim.Framework
                // 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 {}            
+                try {}
                finally
                {
                    rwLock.EnterWriteLock();
@@ -188,18 +194,22 @@ namespace OpenSim.Framework
                    {
                        if (kvp.Value.Equals(value))
                        {
-                            Dictionary2.Remove(key2);
+                            try { }
-                            Dictionary1.Remove(kvp.Key);
+                            finally
+                            {
+                                Dictionary2.Remove(key2);
+                                Dictionary1.Remove(kvp.Key);
+                            }
                            found = true;
                            break;
                        }
                    }
                }
            }
-            finally 
+            finally
-            { 
+            {
                if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
            }
            return found;
@@ -214,20 +224,19 @@ namespace OpenSim.Framework
                // 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 {}            
+                try {}
                finally
                {
                    rwLock.EnterWriteLock();
                    gotLock = true;
+                    Dictionary1.Clear();
+                    Dictionary2.Clear();
                }
-                Dictionary1.Clear();
-                Dictionary2.Clear();
            }
-            finally 
+            finally
-            { 
+            {
                if (gotLock)
-                    rwLock.ExitWriteLock(); 
+                    rwLock.ExitWriteLock();
            }
        }
@@ -251,24 +260,24 @@ namespace OpenSim.Framework
            bool success;
            bool gotLock = false;
-            try 
+            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 {}            
+                try {}
                finally
                {
                    rwLock.EnterReadLock();
                    gotLock = true;
                }
-                success = Dictionary1.TryGetValue(key, out value); 
+                success = Dictionary1.TryGetValue(key, out value);
            }
-            finally 
+            finally
-            { 
+            {
                if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
            }
            return success;
@@ -279,24 +288,24 @@ namespace OpenSim.Framework
            bool success;
            bool gotLock = false;
-            try 
+            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 {}            
+                try {}
                finally
                {
                    rwLock.EnterReadLock();
                    gotLock = true;
                }
-                success = Dictionary2.TryGetValue(key, out value); 
+                success = Dictionary2.TryGetValue(key, out value);
            }
-            finally 
+            finally
-            {   
+            {
                if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
            }
            return success;
@@ -311,7 +320,7 @@ namespace OpenSim.Framework
                // 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 {}            
+                try {}
                finally
                {
                    rwLock.EnterReadLock();
@@ -321,10 +330,10 @@ namespace OpenSim.Framework
                foreach (TValue value in Dictionary1.Values)
                    action(value);
            }
-            finally 
+            finally
-            { 
+            {
                if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
            }
        }
@@ -337,7 +346,7 @@ namespace OpenSim.Framework
                // 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 {}            
+                try {}
                finally
                {
                    rwLock.EnterReadLock();
@@ -347,10 +356,10 @@ namespace OpenSim.Framework
                foreach (KeyValuePair<TKey1, TValue> entry in Dictionary1)
                    action(entry);
            }
-            finally 
+            finally
-            { 
+            {
                if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
            }
        }
@@ -363,7 +372,7 @@ namespace OpenSim.Framework
                // 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 {}            
+                try {}
                finally
                {
                    rwLock.EnterReadLock();
@@ -373,10 +382,10 @@ namespace OpenSim.Framework
                foreach (KeyValuePair<TKey2, TValue> entry in Dictionary2)
                    action(entry);
            }
-            finally 
+            finally
-            { 
+            {
                if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
            }
        }
@@ -389,7 +398,7 @@ namespace OpenSim.Framework
                // 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 {}            
+                try {}
                finally
                {
                    rwLock.EnterReadLock();
@@ -402,10 +411,10 @@ namespace OpenSim.Framework
                        return value;
                }
            }
-            finally 
+            finally
-            { 
+            {
                if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
            }
            return default(TValue);
@@ -421,7 +430,7 @@ namespace OpenSim.Framework
                // 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 {}            
+                try {}
                finally
                {
                    rwLock.EnterReadLock();
@@ -434,10 +443,10 @@ namespace OpenSim.Framework
                        list.Add(value);
                }
            }
-            finally 
+            finally
-            { 
+            {
                if (gotLock)
-                    rwLock.ExitReadLock(); 
+                    rwLock.ExitReadLock();
            }
            return list;
@@ -453,7 +462,7 @@ namespace OpenSim.Framework
                // 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 {}            
+                try {}
                finally
                {
                    rwLock.EnterUpgradeableReadLock();
@@ -477,29 +486,29 @@ namespace OpenSim.Framework
                try
                {
-                    try {}            
+                    try {}
                    finally
                    {
-                        rwLock.EnterUpgradeableReadLock();
+                        rwLock.EnterWriteLock();
                        gotWriteLock = true;
-                    }
-                    for (int i = 0; i < list.Count; i++)
+                        for (int i = 0; i < list.Count; i++)
-                        Dictionary1.Remove(list[i]);
+                            Dictionary1.Remove(list[i]);
-                    for (int i = 0; i < list2.Count; i++)
+                        for (int i = 0; i < list2.Count; i++)
-                        Dictionary2.Remove(list2[i]);
+                            Dictionary2.Remove(list2[i]);
+                    }
                }
-                finally 
+                finally
-                { 
+                {
                    if (gotWriteLock)
-                        rwLock.ExitWriteLock(); 
+                        rwLock.ExitWriteLock();
                }
            }
-            finally 
+            finally
-            { 
+            {
                if (gotUpgradeableLock)
-                    rwLock.ExitUpgradeableReadLock(); 
+                    rwLock.ExitUpgradeableReadLock();
            }
            return list.Count;
diff --git a/OpenSim/Framework/EntityTransferContext.cs b/OpenSim/Framework/EntityTransferContext.cs
new file mode 100644
index 0000000..860414e
--- /dev/null
+++ b/OpenSim/Framework/EntityTransferContext.cs
@@ -0,0 +1,70 @@
+/*
+ * 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.Collections.Generic;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+namespace OpenSim.Framework
+{
+    public class EntityTransferContext
+    {
+        public EntityTransferContext()
+        {
+            InboundVersion = VersionInfo.SimulationServiceVersionAcceptedMax;
+            OutboundVersion = VersionInfo.SimulationServiceVersionSupportedMax;
+            WearablesCount = -1;
+        }
+        public float InboundVersion { get; set; }
+        public float OutboundVersion { get; set; }
+        public int WearablesCount { get; set; }
+        public OSD Pack()
+        {
+            OSDMap data = new OSDMap();
+            data["InboundVersion"] = OSD.FromReal(InboundVersion);
+            data["OutboundVersion"] = OSD.FromReal(OutboundVersion);
+            data["WearablesCount"] = OSD.FromInteger(WearablesCount);
+            return data;
+        }
+        public void Unpack(OSD data)
+        {
+            OSDMap map = (OSDMap)data;
+            if (map.ContainsKey("InboundVersion"))
+                InboundVersion = (float)map["InboundVersion"].AsReal();
+            if (map.ContainsKey("OutboundVersion"))
+                OutboundVersion = (float)map["OutboundVersion"].AsReal();
+            if (map.ContainsKey("WearablesCount"))
+                WearablesCount = map["WearablesCount"].AsInteger();
+        }
+    }
+}
diff --git a/OpenSim/Framework/EstateBan.cs b/OpenSim/Framework/EstateBan.cs
index ebed794..12a92bb 100644
--- a/OpenSim/Framework/EstateBan.cs
+++ b/OpenSim/Framework/EstateBan.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Framework
        {
            get
            {
-                return m_estateID; 
+                return m_estateID;
            }
            set
            {
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 4df7860..8c8270a 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -305,11 +305,17 @@ namespace OpenSim.Framework
                OnSave(this);
        }
+        public int EstateUsersCount()
+        {
+            return l_EstateAccess.Count;
+        }
        public void AddEstateUser(UUID avatarID)
        {
            if (avatarID == UUID.Zero)
                return;
-            if (!l_EstateAccess.Contains(avatarID))
+            if (!l_EstateAccess.Contains(avatarID) &&
+                    (l_EstateAccess.Count < (int)Constants.EstateAccessLimits.AllowedAccess))
                l_EstateAccess.Add(avatarID);
        }
@@ -319,11 +325,17 @@ namespace OpenSim.Framework
                l_EstateAccess.Remove(avatarID);
        }
+        public int EstateGroupsCount()
+        {
+            return l_EstateGroups.Count;
+        }
        public void AddEstateGroup(UUID avatarID)
        {
            if (avatarID == UUID.Zero)
                return;
-            if (!l_EstateGroups.Contains(avatarID))
+            if (!l_EstateGroups.Contains(avatarID) &&
+                    (l_EstateGroups.Count < (int)Constants.EstateAccessLimits.AllowedGroups))
                l_EstateGroups.Add(avatarID);
        }
@@ -333,11 +345,17 @@ namespace OpenSim.Framework
                l_EstateGroups.Remove(avatarID);
        }
+        public int EstateManagersCount()
+        {
+            return l_EstateManagers.Count;
+        }
        public void AddEstateManager(UUID avatarID)
        {
            if (avatarID == UUID.Zero)
                return;
-            if (!l_EstateManagers.Contains(avatarID))
+            if (!l_EstateManagers.Contains(avatarID) &&
+                (l_EstateManagers.Count < (int)Constants.EstateAccessLimits.EstateManagers))
                l_EstateManagers.Add(avatarID);
        }
@@ -365,17 +383,55 @@ namespace OpenSim.Framework
        public bool IsBanned(UUID avatarID)
        {
-            foreach (EstateBan ban in l_EstateBans)
+            if (!IsEstateManagerOrOwner(avatarID))
+            {
+                foreach (EstateBan ban in l_EstateBans)
+                    if (ban.BannedUserID == avatarID)
+                        return true;
+            }
+            return false;
+        }
+        public bool IsBanned(UUID avatarID, int userFlags)
+        {
+            if (!IsEstateManagerOrOwner(avatarID))
+            {
+                foreach (EstateBan ban in l_EstateBans)
                if (ban.BannedUserID == avatarID)
                    return true;
+                if (!HasAccess(avatarID))
+                {
+                    if (DenyMinors)
+                    {
+                        if ((userFlags & 32) == 0)
+                        {
+                            return true;
+                        }
+                    }
+                    if (DenyAnonymous)
+                    {
+                        if ((userFlags & 4) == 0)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
            return false;
        }
+        public int EstateBansCount()
+        {
+            return l_EstateBans.Count;
+        }
        public void AddBan(EstateBan ban)
        {
            if (ban == null)
                return;
-            if (!IsBanned(ban.BannedUserID))
+            if (!IsBanned(ban.BannedUserID, 32) &&
+                (l_EstateBans.Count < (int)Constants.EstateAccessLimits.EstateBans)) //Ignore age-based bans
                l_EstateBans.Add(ban);
        }
@@ -516,14 +572,41 @@ namespace OpenSim.Framework
            // EstateBans are special
            if (map.ContainsKey("EstateBans"))
-            {
+            {               
-                var banData = ((Dictionary<string, object>)map["EstateBans"]).Values;
+                if(map["EstateBans"] is string)
-                EstateBan[] bans = new EstateBan[banData.Count];
+                {
-                int b = 0;
+                    // JSON encoded bans map
-                foreach (Dictionary<string, object> ban in banData)
+                    Dictionary<string, EstateBan> bdata = new Dictionary<string, EstateBan>();
-                    bans[b++] = new EstateBan(ban);
+                    try
-                PropertyInfo bansProperty = this.GetType().GetProperty("EstateBans", BindingFlags.Public | BindingFlags.Instance);
+                    {
-                bansProperty.SetValue(this, bans, null);
+                        // bypass libovm, we dont need even more useless high level maps
+                        // this should only be called once.. but no problem, i hope
+                        // (other uses may need more..)
+                        LitJson.JsonMapper.RegisterImporter<string, UUID>((input) => new UUID(input));
+                        bdata = LitJson.JsonMapper.ToObject<Dictionary<string,EstateBan>>((string)map["EstateBans"]);
+                    }
+ //                   catch(Exception e)
+                    catch
+                    {
+                        return;
+                    }
+                    EstateBan[] jbans = new EstateBan[bdata.Count];
+                    bdata.Values.CopyTo(jbans,0);
+                    PropertyInfo jbansProperty = this.GetType().GetProperty("EstateBans", BindingFlags.Public | BindingFlags.Instance);
+                    jbansProperty.SetValue(this, jbans, null);
+                }
+                else
+                {
+                    var banData = ((Dictionary<string, object>)map["EstateBans"]).Values;
+                    EstateBan[] bans = new EstateBan[banData.Count];
+                    int b = 0;
+                    foreach (Dictionary<string, object> ban in banData)
+                        bans[b++] = new EstateBan(ban);
+                    PropertyInfo bansProperty = this.GetType().GetProperty("EstateBans", BindingFlags.Public | BindingFlags.Instance);
+                    bansProperty.SetValue(this, bans, null);
+                 }
            }
        }
    }
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index da3690c..1605005 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -66,6 +66,7 @@ namespace OpenSim.Framework
            Position = im.Position;
            binaryBucket = im.binaryBucket;
            RegionID = im.RegionID;
+            ParentEstateID = im.ParentEstateID;
            if (addTimestamp)
                timestamp = (uint)Util.UnixTimeSinceEpoch();
@@ -84,6 +85,7 @@ namespace OpenSim.Framework
            fromGroup = _fromGroup;
            message = _message;
            imSessionID = _imSessionID.Guid;
            if (_offline)
                offline = 1;
            else
diff --git a/OpenSim/Framework/IImprovedAssetCache.cs b/OpenSim/Framework/IAssetCache.cs
index a853e90..2df9199 100644
--- a/OpenSim/Framework/IImprovedAssetCache.cs
+++ b/OpenSim/Framework/IAssetCache.cs
@@ -29,7 +29,7 @@ using OpenSim.Framework;
 namespace OpenSim.Framework
 {
-    public interface IImprovedAssetCache
+    public interface IAssetCache
    {
        /// <summary>
        /// Cache the specified asset.
@@ -38,11 +38,18 @@ namespace OpenSim.Framework
        void Cache(AssetBase asset);
        /// <summary>
+        /// Cache that the specified asset wasn't found.
+        /// </summary>
+        /// <param name='id'></param>
+        /// <summary>
+        void CacheNegative(string id);
        /// Get an asset by its id.
        /// </summary>
        /// <param name='id'></param>
-        /// <returns>null if the asset does not exist.</returns>
+        /// <param name='asset'>Will be set to null if no asset was found</param>
-        AssetBase Get(string id);
+        /// <returns>False if the asset has been negative-cached</returns>
+        bool Get(string id, out AssetBase asset);
        /// <summary>
        /// Check whether an asset with the specified id exists in the cache.
@@ -61,4 +68,4 @@ namespace OpenSim.Framework
        /// </summary>
        void Clear();
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index e36edb2..a9044d5 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -47,10 +47,12 @@ namespace OpenSim.Framework
    public delegate void ImprovedInstantMessage(IClientAPI remoteclient, GridInstantMessage im);
-    public delegate void RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
+    public delegate void RezObject(IClientAPI remoteClient, UUID itemID, UUID GroupID,
-                                   UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
+                                Vector3 RayEnd, Vector3 RayStart,
-                                   bool RezSelected, bool RemoveItem, UUID fromTaskID);
+                                UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
+                                bool RezSelected, bool RemoveItem, UUID fromTaskID);
+    public delegate void RezRestoreToWorld(IClientAPI remoteClient, UUID itemId);
    public delegate ISceneEntity RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
    public delegate void RezMultipleAttachmentsFromInv(IClientAPI remoteClient, List<KeyValuePair<UUID, uint>> rezlist );
@@ -58,20 +60,21 @@ 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, byte size, byte action, float north, float west, float south, float east,
        UUID agentId);
    public delegate void NetworkStats(int inPackets, int outPackets, int unAckedBytes);
-    public delegate void CachedTextureRequest(IClientAPI remoteClient, int serial, List<CachedTextureRequestArg> cachedTextureRequest);
    public delegate void SetAppearance(IClientAPI remoteClient, Primitive.TextureEntry textureEntry, byte[] visualParams, Vector3 AvSize, WearableCacheItem[] CacheItems);
+    public delegate void CachedTextureRequest(IClientAPI remoteClient, int serial, List<CachedTextureRequestArg> cachedTextureRequest);
    public delegate void StartAnim(IClientAPI remoteClient, UUID animID);
    public delegate void StopAnim(IClientAPI remoteClient, UUID animID);
+    public delegate void ChangeAnim(UUID animID, bool addOrRemove, bool sendPack);
    public delegate void LinkObjects(IClientAPI remoteClient, uint parent, List<uint> children);
    public delegate void DelinkObjects(List<uint> primIds, IClientAPI client);
@@ -104,7 +107,7 @@ namespace OpenSim.Framework
    public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);
    public delegate void DeRezObject(
-        IClientAPI remoteClient, List<uint> localIDs, UUID groupID, DeRezAction action, UUID destinationID);
+        IClientAPI remoteClient, List<uint> localIDs, UUID groupID, DeRezAction action, UUID destinationID, bool AddToReturns = true);
    public delegate void GenericCall5(IClientAPI remoteClient, bool status);
@@ -114,7 +117,7 @@ namespace OpenSim.Framework
    public delegate void ObjectExtraParams(UUID agentID, uint localID, ushort type, bool inUse, byte[] data);
-    public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
+    public delegate void ObjectSelect(List<uint> localID, IClientAPI remoteClient);
    public delegate void ObjectRequest(uint localID, IClientAPI remoteClient);
@@ -132,6 +135,8 @@ namespace OpenSim.Framework
    public delegate void UpdateVector(uint localID, Vector3 pos, IClientAPI remoteClient);
+    public delegate void ClientChangeObject(uint localID, object data ,IClientAPI remoteClient);
    public delegate void UpdatePrimRotation(uint localID, Quaternion rot, IClientAPI remoteClient);
    public delegate void UpdatePrimSingleRotation(uint localID, Quaternion rot, IClientAPI remoteClient);
@@ -222,10 +227,10 @@ namespace OpenSim.Framework
        byte RayEndIsIntersection);
    public delegate void RequestGodlikePowers(
-        UUID AgentID, UUID SessionID, UUID token, bool GodLike, IClientAPI remote_client);
+        UUID AgentID, UUID SessionID, UUID token, bool GodLike);
    public delegate void GodKickUser(
-        UUID GodAgentID, UUID GodSessionID, UUID AgentID, uint kickflags, byte[] reason);
+        UUID GodAgentID, UUID AgentID, uint kickflags, byte[] reason);
    public delegate void CreateInventoryFolder(
        IClientAPI remoteClient, UUID folderID, ushort folderType, string folderName, UUID parentID);
@@ -238,7 +243,7 @@ namespace OpenSim.Framework
    public delegate void CreateNewInventoryItem(
        IClientAPI remoteClient, UUID transActionID, UUID folderID, uint callbackID, string description, string name,
-        sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask, int creationDate);
+        sbyte invType, sbyte type, byte wearableType, uint everyoneMask, int creationDate);
    public delegate void LinkInventoryItem(
        IClientAPI remoteClient, UUID transActionID, UUID folderID, uint callbackID, string description, string name,
@@ -268,6 +273,9 @@ namespace OpenSim.Framework
    public delegate void MoveInventoryItem(
        IClientAPI remoteClient, List<InventoryItemBase> items);
+    public delegate void MoveItemsAndLeaveCopy(
+        IClientAPI remoteClient, List<InventoryItemBase> items, UUID destFolder);
    public delegate void RemoveInventoryItem(
        IClientAPI remoteClient, List<UUID> itemIDs);
@@ -443,6 +451,7 @@ namespace OpenSim.Framework
    public delegate void ClassifiedInfoRequest(UUID classifiedID, IClientAPI client);
    public delegate void ClassifiedInfoUpdate(UUID classifiedID, uint category, string name, string description, UUID parcelID, uint parentEstate, UUID snapshotID, Vector3 globalPos, byte classifiedFlags, int price, IClientAPI client);
    public delegate void ClassifiedDelete(UUID classifiedID, IClientAPI client);
+    public delegate void ClassifiedGodDelete(UUID classifiedID, UUID queryID, IClientAPI client);
    public delegate void EventNotificationAddRequest(uint EventID, IClientAPI client);
    public delegate void EventNotificationRemoveRequest(uint EventID, IClientAPI client);
@@ -464,47 +473,48 @@ namespace OpenSim.Framework
    public delegate void PlacesQuery(UUID QueryID, UUID TransactionID, string QueryText, uint QueryFlags, byte Category, string SimName, IClientAPI client);
    public delegate void AgentFOV(IClientAPI client, float verticalAngle);
-    
-    public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int Flags,UUID AgentID);
+    public delegate void MuteListEntryUpdate(IClientAPI client, UUID MuteID, string Name, int type, uint flags);
-    
-    public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name, UUID AgentID);
+    public delegate void MuteListEntryRemove(IClientAPI client, UUID MuteID, string Name);
-    
    public delegate void AvatarInterestReply(IClientAPI client,UUID target, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages);
-    
    public delegate void FindAgentUpdate(IClientAPI client, UUID hunter, UUID target);
-    
    public delegate void TrackAgentUpdate(IClientAPI client, UUID hunter, UUID target);
-    
    public delegate void FreezeUserUpdate(IClientAPI client, UUID parcelowner,uint flags, UUID target);
-    
    public delegate void EjectUserUpdate(IClientAPI client, UUID parcelowner,uint flags, UUID target);
-    
    public delegate void NewUserReport(IClientAPI client, string regionName,UUID abuserID, byte catagory, byte checkflags, string details, UUID objectID, Vector3 postion, byte reportType ,UUID screenshotID, string Summary, UUID reporter);
-    
    public delegate void GodUpdateRegionInfoUpdate(IClientAPI client, float BillableFactor, ulong EstateID, ulong RegionFlags, byte[] SimName,int RedirectX, int RedirectY);
-    
    public delegate void GodlikeMessage(IClientAPI client, UUID requester, byte[] Method, byte[] Parameter);
-    
    public delegate void SaveStateHandler(IClientAPI client,UUID agentID);
-    
    public delegate void GroupAccountSummaryRequest(IClientAPI client,UUID agentID, UUID groupID);
-    
    public delegate void GroupAccountDetailsRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
-    
    public delegate void GroupAccountTransactionsRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
-    
    public delegate void ParcelBuyPass(IClientAPI client, UUID agentID, int ParcelLocalID);
-    
    public delegate void ParcelGodMark(IClientAPI client, UUID agentID, int ParcelLocalID);
-    
    public delegate void GroupActiveProposalsRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
-    
    public delegate void GroupVoteHistoryRequest(IClientAPI client,UUID agentID, UUID groupID, UUID transactionID, UUID sessionID);
-    
-    
    public delegate void SimWideDeletesDelegate(IClientAPI client,UUID agentID, int flags, UUID targetID);
-    
    public delegate void SendPostcard(IClientAPI client);
+    public delegate void ChangeInventoryItemFlags(IClientAPI client, UUID itemID, uint flags);
    #endregion
@@ -575,10 +585,10 @@ namespace OpenSim.Framework
        public float dwell;
    }
-    public class IEntityUpdate
+    public class EntityUpdate
    {
        private ISceneEntity m_entity;
-        private uint m_flags;
+        private PrimUpdateFlags m_flags;
        private int m_updateTime;
        public ISceneEntity Entity
@@ -586,7 +596,7 @@ namespace OpenSim.Framework
            get { return m_entity; }
        }
-        public uint Flags
+        public PrimUpdateFlags Flags
        {
            get { return m_flags; }
        }
@@ -596,23 +606,30 @@ namespace OpenSim.Framework
            get { return m_updateTime; }
        }
-        public virtual void Update(IEntityUpdate update)
+        public virtual void Update(EntityUpdate oldupdate)
        {
-            m_flags |= update.Flags;
+            // we are on the new one
+            PrimUpdateFlags updateFlags = oldupdate.Flags;
+            if(m_flags.HasFlag(PrimUpdateFlags.CancelKill))
+                m_flags = PrimUpdateFlags.FullUpdate;
+            else if(updateFlags.HasFlag(PrimUpdateFlags.Kill))
+                return;
+            else // kill case will just merge in
+                m_flags |= updateFlags;
            // Use the older of the updates as the updateTime
-            if (Util.EnvironmentTickCountCompare(UpdateTime, update.UpdateTime) > 0)
+            if (Util.EnvironmentTickCountCompare(UpdateTime, oldupdate.UpdateTime) > 0)
-                m_updateTime = update.UpdateTime;
+                m_updateTime = oldupdate.UpdateTime;
        }
-        public IEntityUpdate(ISceneEntity entity, uint flags)
+        public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags)
        {
            m_entity = entity;
            m_flags = flags;
            m_updateTime = Util.EnvironmentTickCount();
        }
-        public IEntityUpdate(ISceneEntity entity, uint flags, Int32 updateTime)
+        public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, Int32 updateTime)
        {
            m_entity = entity;
            m_flags = flags;
@@ -620,29 +637,6 @@ namespace OpenSim.Framework
        }
    }
-    public class EntityUpdate : IEntityUpdate
-    {
-        private float m_timeDilation;
-        public float TimeDilation
-        {
-            get { return m_timeDilation; }
-        }
-        public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation)
-            : base(entity, (uint)flags)
-        {
-            // Flags = flags;
-            m_timeDilation = timedilation;
-        }
-        public EntityUpdate(ISceneEntity entity, PrimUpdateFlags flags, float timedilation, Int32 updateTime)
-            : base(entity,(uint)flags,updateTime)
-        {
-            m_timeDilation = timedilation;
-        }
-    }
    public class PlacesReplyData
    {
        public UUID OwnerID;
@@ -691,9 +685,13 @@ namespace OpenSim.Framework
        ExtraData = 1 << 20,
        Sound = 1 << 21,
        Joint = 1 << 22,
-        FullUpdate = UInt32.MaxValue
+        FullUpdate =    0x0fffffff,
+        SendInTransit = 0x20000000, 
+        CancelKill =    0x4fffffff, // 1 << 30 
+        Kill =          0x80000000 // 1 << 31
    }
+/* included in .net 4.0
    public static class PrimUpdateFlagsExtensions
    {
        public static bool HasFlag(this PrimUpdateFlags updateFlags, PrimUpdateFlags flag)
@@ -701,7 +699,7 @@ namespace OpenSim.Framework
            return (updateFlags & flag) == flag;
        }
    }
+*/
    public interface IClientAPI
    {
        Vector3 StartPos { get; set; }
@@ -718,11 +716,15 @@ namespace OpenSim.Framework
        UUID SecureSessionId { get; }
-        UUID ActiveGroupId { get; }
+        UUID ActiveGroupId { get; set; }
+        string ActiveGroupName { get; set;}
-        string ActiveGroupName { get; }
+        ulong ActiveGroupPowers { get; set;}
-        ulong ActiveGroupPowers { get; }
+        Dictionary<UUID, ulong> GetGroupPowers();
+        void SetGroupPowers(Dictionary<UUID, ulong> powers);
        ulong GetGroupPowers(UUID groupID);
@@ -734,6 +736,8 @@ namespace OpenSim.Framework
        IScene Scene { get; }
+        List<uint> SelectedObjects { get; }
        // [Obsolete("LLClientView Specific - Replace with ???")]
        int NextAnimationSequenceNumber { get; }
@@ -747,6 +751,8 @@ namespace OpenSim.Framework
        /// </summary>
        bool IsActive { get; set; }
+        int PingTimeMS { get; }
        /// <summary>
        /// Set if the client is closing due to a logout request
        /// </summary>
@@ -758,7 +764,7 @@ namespace OpenSim.Framework
        /// Only set for root agents.
        /// </remarks>
        bool IsLoggingOut { get; set; }
-        
        bool SendLogoutPacketWhenClosing { set; }
        // [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")]
@@ -794,6 +800,7 @@ namespace OpenSim.Framework
        event ObjectDrop OnObjectDrop;
        event StartAnim OnStartAnim;
        event StopAnim OnStopAnim;
+        event ChangeAnim OnChangeAnim;
        event LinkObjects OnLinkObjects;
        event DelinkObjects OnDelinkObjects;
        event RequestMapBlocks OnRequestMapBlocks;
@@ -805,6 +812,7 @@ namespace OpenSim.Framework
        event TeleportLandmarkRequest OnTeleportLandmarkRequest;
        event TeleportCancel OnTeleportCancel;
        event DeRezObject OnDeRezObject;
+        event RezRestoreToWorld OnRezRestoreToWorld;
        event Action<IClientAPI> OnRegionHandShakeReply;
        event GenericCall1 OnRequestWearables;
        event Action<IClientAPI, bool> OnCompleteMovementToRegion;
@@ -860,6 +868,7 @@ namespace OpenSim.Framework
        event RequestObjectPropertiesFamily OnRequestObjectPropertiesFamily;
        event UpdatePrimFlags OnUpdatePrimFlags;
        event UpdatePrimTexture OnUpdatePrimTexture;
+        event ClientChangeObject onClientChangeObject;
        event UpdateVector OnUpdatePrimGroupPosition;
        event UpdateVector OnUpdatePrimSinglePosition;
        event UpdatePrimRotation OnUpdatePrimGroupRotation;
@@ -884,6 +893,7 @@ namespace OpenSim.Framework
        event RequestTaskInventory OnRequestTaskInventory;
        event UpdateInventoryItem OnUpdateInventoryItem;
        event CopyInventoryItem OnCopyInventoryItem;
+        event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
        event MoveInventoryItem OnMoveInventoryItem;
        event RemoveInventoryFolder OnRemoveInventoryFolder;
        event RemoveInventoryItem OnRemoveInventoryItem;
@@ -1002,7 +1012,7 @@ namespace OpenSim.Framework
        event ClassifiedInfoRequest OnClassifiedInfoRequest;
        event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
        event ClassifiedDelete OnClassifiedDelete;
-        event ClassifiedDelete OnClassifiedGodDelete;
+        event ClassifiedGodDelete OnClassifiedGodDelete;
        event EventNotificationAddRequest OnEventNotificationAddRequest;
        event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -1025,7 +1035,7 @@ namespace OpenSim.Framework
        event MuteListRequest OnMuteListRequest;
        event PlacesQuery OnPlacesQuery;
-        
        event FindAgentUpdate OnFindAgent;
        event TrackAgentUpdate OnTrackAgent;
        event NewUserReport OnUserReport;
@@ -1041,11 +1051,12 @@ namespace OpenSim.Framework
        event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
        event SimWideDeletesDelegate OnSimWideDeletes;
        event SendPostcard OnSendPostcard;
+        event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
        event MuteListEntryUpdate OnUpdateMuteListEntry;
        event MuteListEntryRemove OnRemoveMuteListEntry;
        event GodlikeMessage onGodlikeMessage;
        event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
+        event GenericCall2 OnUpdateThrottles;
        /// <summary>
        /// Set the debug level at which packet output should be printed to console.
        /// </summary>
@@ -1066,15 +1077,15 @@ namespace OpenSim.Framework
        /// If true, attempts the close without checking active status.  You do not want to try this except as a last
        /// ditch attempt where Active == false but the ScenePresence still exists.
        /// </param>
-        void Close(bool force);
+        void Close(bool sendStop, bool force);
        void Kick(string message);
-        
        /// <summary>
        /// Start processing for this client.
        /// </summary>
        void Start();
-        
        void Stop();
        //     void ActivateGesture(UUID assetId, UUID gestureId);
@@ -1102,6 +1113,8 @@ namespace OpenSim.Framework
        /// <param name="localID"></param>
        void SendKillObject(List<uint> localID);
+//        void SendPartFullUpdate(ISceneEntity ent, uint? parentID);
        void SendAnimations(UUID[] animID, int[] seqs, UUID sourceAgentId, UUID[] objectIDs);
        void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args);
@@ -1125,11 +1138,13 @@ namespace OpenSim.Framework
        void SendGenericMessage(string method, UUID invoice, List<string> message);
        void SendGenericMessage(string method, UUID invoice, List<byte[]> message);
+        bool CanSendLayerData();
        void SendLayerData(float[] map);
        void SendLayerData(int px, int py, float[] map);
-        void SendWindData(Vector2[] windSpeeds);
+        void SendWindData(int version, Vector2[] windSpeeds);
-        void SendCloudData(float[] cloudCover);
+        void SendCloudData(int version, float[] cloudCover);
        /// <summary>
        /// Sent when an agent completes its movement into a region.
@@ -1141,7 +1156,7 @@ namespace OpenSim.Framework
        void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look);
        void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);
-        
        /// <summary>
        /// Return circuit information for this client.
        /// </summary>
@@ -1168,8 +1183,13 @@ namespace OpenSim.Framework
        void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations);
        void SetChildAgentThrottle(byte[] throttle);
+        void SetChildAgentThrottle(byte[] throttle,float factor);
+        void SetAgentThrottleSilent(int throttle, int setting);
+        int GetAgentThrottleSilent(int throttle);
-        void SendAvatarDataImmediate(ISceneEntity avatar);
+        void SendEntityFullUpdateImmediate(ISceneEntity entity);
+        void SendEntityTerseUpdateImmediate(ISceneEntity entity);
        /// <summary>
        /// Send a positional, velocity, etc. update to the viewer for a given entity.
@@ -1192,6 +1212,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <param name="Item"></param>
        void SendInventoryItemCreateUpdate(InventoryItemBase Item, uint callbackId);
+        void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId);
        void SendRemoveInventoryItem(UUID itemID);
@@ -1204,14 +1225,14 @@ namespace OpenSim.Framework
        /// <summary>
        /// Used by the server to inform the client of new inventory items and folders.
        /// </summary>
-        /// 
+        ///
        /// If the node is a folder then the contents will be transferred
        /// (including all descendent folders) as well as the folder itself.
-        /// 
+        ///
        /// <param name="node"></param>
        void SendBulkUpdateInventory(InventoryNodeBase node);
-        void SendXferPacket(ulong xferID, uint packet, byte[] data);
+        void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory);
        void SendAbortXferPacket(ulong xferID);
@@ -1237,9 +1258,11 @@ namespace OpenSim.Framework
        void SendAttachedSoundGainChange(UUID objectID, float gain);
        void SendNameReply(UUID profileId, string firstname, string lastname);
-        void SendAlertMessage(string message);
+        void SendAlertMessage(string message);
+        void SendAlertMessage(string message, string into);
        void SendAgentAlertMessage(string message, bool modal);
        void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url);
        /// <summary>
@@ -1268,11 +1291,11 @@ namespace OpenSim.Framework
        /// <param name="OrbitalPosition">The orbital position is given in radians, and must be "adjusted" for the linden client, see LLClientView</param>
        void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear,
                        float OrbitalPosition);
-        
        void SendViewerEffect(ViewerEffectPacket.EffectBlock[] effectBlocks);
        void SendViewerTime(int phase);
-        void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, string flAbout,
+        void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] membershipType, string flAbout,
                                  uint flags, UUID flImageID, UUID imageID, string profileURL, UUID partnerID);
        void SendScriptQuestion(UUID taskID, string taskName, string ownerName, UUID itemID, int question);
@@ -1336,7 +1359,7 @@ namespace OpenSim.Framework
        void SendImageFirstPart(ushort numParts, UUID ImageUUID, uint ImageSize, byte[] ImageData, byte imageCodec);
        /// <summary>
-        /// Send the next packet for a series of packets making up a single texture, 
+        /// Send the next packet for a series of packets making up a single texture,
        /// as established by SendImageFirstPart()
        /// </summary>
        /// <param name="partNumber"></param>
@@ -1361,12 +1384,16 @@ namespace OpenSim.Framework
        void SendObjectPropertiesReply(ISceneEntity Entity);
+        void SendSelectedPartsProprieties(List<ISceneEntity> parts);
        void SendPartPhysicsProprieties(ISceneEntity Entity);
        void SendAgentOffline(UUID[] agentIDs);
        void SendAgentOnline(UUID[] agentIDs);
+        void SendFindAgent(UUID HunterID, UUID PreyID, double GlobalX, double GlobalY);
        void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot,
                             Vector3 CameraAtOffset, Vector3 CameraEyeOffset, bool ForceMouseLook);
@@ -1432,6 +1459,7 @@ namespace OpenSim.Framework
        void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags);
        void SendAvatarGroupsReply(UUID avatarID, GroupMembershipData[] data);
+        void SendAgentGroupDataUpdate(UUID avatarID, GroupMembershipData[] data);
        void SendOfferCallingCard(UUID srcID, UUID transactionID);
        void SendAcceptCallingCard(UUID transactionID);
        void SendDeclineCallingCard(UUID transactionID);
@@ -1443,6 +1471,9 @@ namespace OpenSim.Framework
        void SendAgentDropGroup(UUID groupID);
        void RefreshGroupMembership();
+        void UpdateGroupMembership(GroupMembershipData[] data);
+        void GroupMembershipRemove(UUID GroupID);
+        void GroupMembershipAddReplace(UUID GroupID,ulong GroupPowers);
        void SendAvatarNotesReply(UUID targetID, string text);
        void SendAvatarPicksReply(UUID targetID, Dictionary<UUID, string> picks);
        void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled);
@@ -1452,9 +1483,9 @@ namespace OpenSim.Framework
        void SendParcelDwellReply(int localID, UUID parcelID, float dwell);
        void SendUserInfoReply(bool imViaEmail, bool visible, string email);
-        
-        void SendUseCachedMuteList();
+        void SendUseCachedMuteList();
+        void SendEmpytMuteList();
        void SendMuteListUpdate(string filename);
        void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals);
@@ -1466,13 +1497,13 @@ namespace OpenSim.Framework
        void SendRebakeAvatarTextures(UUID textureID);
        void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages);
-        
        void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt);
-        
        void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier);
-        
        void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt);
-        
        void SendChangeUserRights(UUID agentID, UUID friendID, int rights);
        void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId);
diff --git a/OpenSim/Framework/ICnmCache.cs b/OpenSim/Framework/ICnmCache.cs
index 27b9c56..69b5b42 100644
--- a/OpenSim/Framework/ICnmCache.cs
+++ b/OpenSim/Framework/ICnmCache.cs
@@ -34,10 +34,10 @@ namespace OpenSim.Framework
    /// Represent generic cache to store key/value pairs (elements) limited by time, size and count of elements.
    /// </summary>
    /// <typeparam name="TKey">
-    /// The type of keys in the cache. 
+    /// The type of keys in the cache.
    /// </typeparam>
    /// <typeparam name="TValue">
-    /// The type of values in the cache. 
+    /// The type of values in the cache.
    /// </typeparam>
    /// <remarks>
    /// <para>
@@ -51,8 +51,8 @@ namespace OpenSim.Framework
    /// <item>
    /// <term>Time</term>
    /// <description>
-    /// Element that is not accessed through <see cref="TryGetValue"/> or <see cref="Set"/> in last <see cref="ExpirationTime"/> are 
+    /// Element that is not accessed through <see cref="TryGetValue"/> or <see cref="Set"/> in last <see cref="ExpirationTime"/> are
-    /// removed from the cache automatically. Depending on implementation of the cache some of elements may stay longer in cache. 
+    /// removed from the cache automatically. Depending on implementation of the cache some of elements may stay longer in cache.
    /// <see cref="IsTimeLimited"/> returns <see langword="true"/>, if cache is limited by time.
    /// </description>
    /// </item>
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
    /// <term>Count</term>
    /// <description>
    /// When adding an new element to cache that already have <see cref="MaxCount"/> of elements, cache will remove less recently
-    /// used element(s) from the cache, until element fits to cache. 
+    /// used element(s) from the cache, until element fits to cache.
    /// <see cref="IsCountLimited"/> returns <see langword="true"/>, if cache is limiting element count.
    /// </description>
    /// </item>
@@ -69,8 +69,8 @@ namespace OpenSim.Framework
    /// <description>
    /// <description>
    /// When adding an new element to cache that already have <see cref="MaxSize"/> of elements, cache will remove less recently
-    /// used element(s) from the cache, until element fits to cache. 
+    /// used element(s) from the cache, until element fits to cache.
-    /// <see cref="IsSizeLimited"/> returns <see langword="true"/>, if cache is limiting total size of elements. 
+    /// <see cref="IsSizeLimited"/> returns <see langword="true"/>, if cache is limiting total size of elements.
    /// Normally size is bytes used by element in the cache. But it can be any other suitable unit of measure.
    /// </description>
    /// </description>
@@ -84,8 +84,8 @@ namespace OpenSim.Framework
        /// </summary>
        /// <remarks>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="MaxCount"/>
@@ -102,13 +102,13 @@ namespace OpenSim.Framework
        /// </value>
        /// <remarks>
        /// <para>
-        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ExpirationTime"/> 
+        /// When element has been stored in <see cref="ICnmCache{TKey,TValue}"/> longer than <see cref="ExpirationTime"/>
-        /// and it is not accessed through <see cref="TryGetValue"/> method or element's value is 
+        /// and it is not accessed through <see cref="TryGetValue"/> method or element's value is
-        /// not replaced by <see cref="Set"/> method, then it is automatically removed from the 
+        /// not replaced by <see cref="Set"/> method, then it is automatically removed from the
        /// <see cref="ICnmCache{TKey,TValue}"/>.
        /// </para>
        /// <para>
-        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time, 
+        /// It is possible that <see cref="ICnmCache{TKey,TValue}"/> implementation removes element before it's expiration time,
        /// because total size or count of elements stored to cache is larger than <see cref="MaxSize"/> or <see cref="MaxCount"/>.
        /// </para>
        /// <para>
@@ -135,12 +135,12 @@ namespace OpenSim.Framework
        /// Gets a value indicating whether or not access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe).
        /// </summary>
        /// <value>
-        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe); 
+        /// <see langword="true"/> if access to the <see cref="ICnmCache{TKey,TValue}"/> is synchronized (thread safe);
-        /// otherwise, <see langword="false"/>. 
+        /// otherwise, <see langword="false"/>.
        /// </value>
        /// <remarks>
        /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/> object, use
        /// <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> in <see cref="CnmSynchronizedCache{TKey,TValue}"/> class
        /// to retrieve synchronized wrapper for <see cref="ICnmCache{TKey,TValue}"/> object.
        /// </para>
@@ -153,17 +153,17 @@ namespace OpenSim.Framework
        /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting count of elements.
        /// </summary>
        /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited; 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> count of elements is limited;
-        /// otherwise, <see langword="false"/>. 
+        /// otherwise, <see langword="false"/>.
        /// </value>
        /// <remarks>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="Count"/>
-        /// <seealso cref="MaxCount"/> 
+        /// <seealso cref="MaxCount"/>
        /// <seealso cref="IsSizeLimited"/>
        /// <seealso cref="IsTimeLimited"/>
        bool IsCountLimited { get; }
@@ -172,13 +172,13 @@ namespace OpenSim.Framework
        /// Gets a value indicating whether <see cref="ICnmCache{TKey,TValue}"/> is limiting size of elements.
        /// </summary>
        /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited; 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> total size of elements is limited;
-        /// otherwise, <see langword="false"/>. 
+        /// otherwise, <see langword="false"/>.
        /// </value>
        /// <remarks>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="MaxElementSize"/>
@@ -192,13 +192,13 @@ namespace OpenSim.Framework
        /// Gets a value indicating whether elements stored to <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time.
        /// </summary>
        /// <value>
-        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements; 
+        /// <see langword="true"/> if the <see cref="ICnmCache{TKey,TValue}"/> has a fixed total size of elements;
-        /// otherwise, <see langword="false"/>. 
+        /// otherwise, <see langword="false"/>.
        /// </value>
        /// <remarks>
        /// If <see cref="ICnmCache{TKey,TValue}"/> have limited inactivity time and element is not accessed through <see cref="Set"/>
-        /// or <see cref="TryGetValue"/> methods in <see cref="ExpirationTime"/> , then element is automatically removed from 
+        /// or <see cref="TryGetValue"/> methods in <see cref="ExpirationTime"/> , then element is automatically removed from
-        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may 
+        /// the cache. Depending on implementation of the <see cref="ICnmCache{TKey,TValue}"/>, some of the elements may
        /// stay longer in cache.
        /// </remarks>
        /// <seealso cref="ExpirationTime"/>
@@ -206,18 +206,18 @@ namespace OpenSim.Framework
        /// <seealso cref="IsCountLimited"/>
        /// <seealso cref="IsSizeLimited"/>
        bool IsTimeLimited { get; }
-        
        /// <summary>
        /// Gets or sets maximal allowed count of elements that can be stored to <see cref="ICnmCache{TKey,TValue}"/>.
        /// </summary>
        /// <value>
-        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements; 
+        /// <see cref="int.MaxValue"/>, if <see cref="ICnmCache{TKey,TValue}"/> is not limited by count of elements;
        /// otherwise maximal allowed count of elements.
        /// </value>
        /// <remarks>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        int MaxCount { get; set; }
@@ -230,7 +230,7 @@ namespace OpenSim.Framework
        /// </value>
        /// <remarks>
        /// <para>
-        /// If element's size is larger than <see cref="MaxElementSize"/>, then element is 
+        /// If element's size is larger than <see cref="MaxElementSize"/>, then element is
        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>.
        /// </para>
        /// </remarks>
@@ -251,8 +251,8 @@ namespace OpenSim.Framework
        /// Normally size is total bytes used by elements in the cache. But it can be any other suitable unit of measure.
        /// </para>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <exception cref="ArgumentOutOfRangeException">value is less than 0.</exception>
@@ -272,11 +272,11 @@ namespace OpenSim.Framework
        /// Normally bytes, but can be any suitable unit of measure.
        /// </para>
        /// <para>
-        /// Element's size is given when element is added or replaced by <see cref="Set"/> method. 
+        /// Element's size is given when element is added or replaced by <see cref="Set"/> method.
        /// </para>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
-        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/> will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="MaxElementSize"/>
@@ -294,8 +294,8 @@ namespace OpenSim.Framework
        /// </value>
        /// <remarks>
        /// <para>
-        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/> 
+        /// To get synchronized (thread safe) access to <see cref="ICnmCache{TKey,TValue}"/>, use <see cref="CnmSynchronizedCache{TKey,TValue}"/>
-        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to 
+        /// method <see cref="CnmSynchronizedCache{TKey,TValue}.Synchronized"/> to retrieve synchronized wrapper interface to
        /// <see cref="ICnmCache{TKey,TValue}"/>.
        /// </para>
        /// </remarks>
@@ -367,7 +367,7 @@ namespace OpenSim.Framework
        void RemoveRange(IEnumerable<TKey> keys);
        /// <summary>
-        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to 
+        /// Add or replace an element with the provided <paramref name="key"/>, <paramref name="value"/> and <paramref name="size"/> to
        /// <see cref="ICnmCache{TKey,TValue}"/>.
        /// </summary>
        /// <param name="key">
@@ -380,7 +380,7 @@ namespace OpenSim.Framework
        /// The element's size. Normally bytes, but can be any suitable unit of measure.
        /// </param>
        /// <returns>
-        /// <see langword="true"/> if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>; 
+        /// <see langword="true"/> if element has been added successfully to the <see cref="ICnmCache{TKey,TValue}"/>;
        /// otherwise <see langword="false"/>.
        /// </returns>
        /// <exception cref="ArgumentNullException">
@@ -391,17 +391,17 @@ namespace OpenSim.Framework
        /// </exception>
        /// <remarks>
        /// <para>
-        /// If element's <paramref name="size"/> is larger than <see cref="MaxElementSize"/>, then element is 
+        /// If element's <paramref name="size"/> is larger than <see cref="MaxElementSize"/>, then element is
-        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is 
+        /// not added to the <see cref="ICnmCache{TKey,TValue}"/>, however - possible older element is
-        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>. 
+        /// removed from the <see cref="ICnmCache{TKey,TValue}"/>.
        /// </para>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting total size of elements,
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
        /// </para>
        /// <para>
-        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count, 
+        /// When adding an new element to <see cref="ICnmCache{TKey,TValue}"/> that is limiting element count,
-        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element. 
+        /// <see cref="ICnmCache{TKey,TValue}"/>will remove less recently used elements until it can fit an new element.
        /// </para>
        /// </remarks>
        /// <seealso cref="IsSizeLimited"/>
@@ -417,15 +417,15 @@ namespace OpenSim.Framework
        /// Gets the <paramref name="value"/> associated with the specified <paramref name="key"/>.
        /// </summary>
        /// <returns>
-        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with 
+        /// <see langword="true"/>if the <see cref="ICnmCache{TKey,TValue}"/> contains an element with
        /// the specified key; otherwise, <see langword="false"/>.
        /// </returns>
        /// <param name="key">
        /// The key whose <paramref name="value"/> to get.
        /// </param>
        /// <param name="value">
-        /// When this method returns, the value associated with the specified <paramref name="key"/>, 
+        /// When this method returns, the value associated with the specified <paramref name="key"/>,
-        /// if the <paramref name="key"/> is found; otherwise, the 
+        /// if the <paramref name="key"/> is found; otherwise, the
        /// default value for the type of the <paramref name="value"/> parameter. This parameter is passed uninitialized.
        /// </param>
        /// <exception cref="ArgumentNullException">
diff --git a/OpenSim/Framework/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs
index c46c03c..8667837 100644
--- a/OpenSim/Framework/ILandChannel.cs
+++ b/OpenSim/Framework/ILandChannel.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// </summary>
        /// <returns></returns>
        List<ILandObject> AllParcels();
-             
        /// <summary>
        /// Get the parcel at the specified point
        /// </summary>
@@ -75,7 +75,9 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="localID"></param>
        /// <returns></returns>
        ILandObject GetLandObject(int localID);
-        
+        ILandObject GetLandObject(UUID GlobalID);
        /// <summary>
        /// Clear the land channel of all parcels.
        /// </summary>
@@ -83,9 +85,10 @@ namespace OpenSim.Region.Framework.Interfaces
        /// If true, set up a default parcel covering the whole region owned by the estate owner.
        /// </param>
        void Clear(bool setupDefaultParcel);
-        
        bool IsForcefulBansAllowed();
        void UpdateLandObject(int localID, LandData data);
+        void SendParcelsOverlay(IClientAPI client);
        void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient);
        void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel);
        void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel);
@@ -93,5 +96,7 @@ 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);
    }
 }
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 8465c86..a783256 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -43,32 +43,39 @@ namespace OpenSim.Framework
        LandData LandData { get; set; }
        bool[,] LandBitmap { get; set; }
        UUID RegionUUID { get; }
-        
        /// <summary>
        /// Prim counts for this land object.
        /// </summary>
        IPrimCounts PrimCounts { get; set; }
-        
        /// <summary>
-        /// The start point for the land object.  This is the western-most point as one scans land working from 
+        /// The start point for the land object.  This is the northern-most point as one scans land working from
-        /// north to south.
+        /// west to east.
        /// </summary>
-        Vector3 StartPoint { get; }
+        Vector2 StartPoint { get; }
-        
        /// <summary>
-        /// The end point for the land object.  This is the eastern-most point as one scans land working from 
+        /// The end point for the land object.  This is the southern-most point as one scans land working from
-        /// south to north.
+        /// west to east.
-        /// </summary>        
+        /// </summary>
-        Vector3 EndPoint { get; }
+        Vector2 EndPoint { get; }
-        
+        // a estimation of a parcel center.
+        Vector2 CenterPoint { get; }
+        // get positions
+        Vector2? GetNearestPoint(Vector3 pos);
+        Vector2? GetNearestPointAlongDirection(Vector3 pos, Vector3 pdirection);
        bool ContainsPoint(int x, int y);
-        
        ILandObject Copy();
        void SendLandUpdateToAvatarsOverMe();
        void SendLandProperties(int sequence_id, bool snap_selection, int request_result, IClientAPI remote_client);
-        void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client);
+        bool UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client, out bool snap_selection, out bool needOverlay);
        bool IsEitherBannedOrRestricted(UUID avatar);
        bool IsBannedFromLand(UUID avatar);
        bool CanBeOnThisLand(UUID avatar, float posHeight);
@@ -90,27 +97,70 @@ namespace OpenSim.Framework
        /// </summary>
        /// <returns>The bitmap created.</returns>
        bool[,] BasicFullRegionLandBitmap();
-        
        /// <summary>
        /// Create a square land bitmap.
        /// </summary>
        /// <remarks>
        /// Land co-ordinates are zero indexed.  The inputs are treated as points.  So if you want to create a bitmap
-        /// that covers an entire 256 x 256m region apart from a strip of land on the east, then you would need to 
+        /// that covers an entire 256 x 256m region apart from a strip of land on the east, then you would need to
-        /// specify start_x = 0, start_y = 0, end_x = 252 (or anything up to 255), end_y = 256.
+        /// specify start_x = 0, start_y = 0, end_x = 252 (or anything up to 255), end_y = 255.
-        /// 
+        ///
-        /// At the moment, the smallest parcel of land is 4m x 4m, so if the 
+        /// At the moment, the smallest parcel of land is 4m x 4m, so if the
        /// region is 256 x 256m (the SL size), the bitmap returned will start at (0,0) and end at (63,63).
+        /// The value of the set_value needs to be true to define an active parcel of the given size.
        /// </remarks>
        /// <param name="start_x"></param>
        /// <param name="start_y"></param>
        /// <param name="end_x"></param>
        /// <param name="end_y"></param>
+        /// <param name="set_value"></param>
        /// <returns>The bitmap created.</returns>
-        bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y);
+        bool[,] GetSquareLandBitmap(int start_x, int start_y, int end_x, int end_y, bool set_value = true);
-        
        bool[,] ModifyLandBitmapSquare(bool[,] land_bitmap, int start_x, int start_y, int end_x, int end_y, bool set_value);
+        /// <summary>
+        /// Merge two (same size) land bitmaps.
+        /// </summary>
+        /// <param name="bitmap_base"></param>
+        /// <param name="bitmap_add"></param>
+        /// <returns>The modified bitmap.</returns>
        bool[,] MergeLandBitmaps(bool[,] bitmap_base, bool[,] bitmap_add);
+        /// <summary>
+        /// Remap a land bitmap. Takes the supplied land bitmap and rotates it, crops it and finally offsets it into
+        /// a final land bitmap of the target region size.
+        /// </summary>
+        /// <param name="bitmap_base">The original parcel bitmap</param>
+        /// <param name="rotationDegrees"></param>
+        /// <param name="displacement">&lt;x,y,?&gt;</param>
+        /// <param name="boundingOrigin">&lt;x,y,?&gt;</param>
+        /// <param name="boundingSize">&lt;x,y,?&gt;</param>
+        /// <param name="regionSize">&lt;x,y,?&gt;</param>
+        /// <param name="isEmptyNow">out: This is set if the resultant bitmap is now empty</param>
+        /// <param name="AABBMin">out: parcel.AABBMin &lt;x,y,0&gt</param>
+        /// <param name="AABBMax">out: parcel.AABBMax &lt;x,y,0&gt</param>
+        /// <returns>New parcel bitmap</returns>
+        bool[,] RemapLandBitmap(bool[,] bitmap_base, Vector2 displacement, float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize, Vector2 regionSize, out bool isEmptyNow, out Vector3 AABBMin, out Vector3 AABBMax);
+        /// <summary>
+        /// Clears any parcel data in bitmap_base where there exists parcel data in bitmap_new. In other words the parcel data
+        /// in bitmap_new takes over the space of the parcel data in bitmap_base.
+        /// </summary>
+        /// <param name="bitmap_base"></param>
+        /// <param name="bitmap_new"></param>
+        /// <param name="isEmptyNow">out: This is set if the resultant bitmap is now empty</param>
+        /// <param name="AABBMin">out: parcel.AABBMin &lt;x,y,0&gt;</param>
+        /// <param name="AABBMax">out: parcel.AABBMax &lt;x,y,0&gt</param>
+        /// <returns>New parcel bitmap</returns>
+        bool[,] RemoveFromLandBitmap(bool[,] bitmap_base, bool[,] bitmap_new, out bool isEmptyNow, out Vector3 AABBMin, out Vector3 AABBMax);
+        byte[] ConvertLandBitmapToBytes();
+        bool[,] ConvertBytesToLandBitmap(bool overrideRegionSize = false);
+        bool IsLandBitmapEmpty(bool[,] landBitmap);
+        void DebugLandBitmap(bool[,] landBitmap);
        void SendForceObjectSelect(int local_id, int request_type, List<UUID> returnIDs, IClientAPI remote_client);
        void SendLandObjectOwners(IClientAPI remote_client);
        void ReturnLandObjects(uint type, UUID[] owners, UUID[] tasks, IClientAPI remote_client);
@@ -127,7 +177,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <param name="url"></param>
        void SetMediaUrl(string url);
-        
        /// <summary>
        /// Set the music url for this land parcel
        /// </summary>
@@ -139,5 +189,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <returns>The music url.</returns>
        string GetMusicUrl();
+        void Clear();
    }
 }
diff --git a/OpenSim/Framework/IMoneyModule.cs b/OpenSim/Framework/IMoneyModule.cs
index 52f3e83..c72c742 100644
--- a/OpenSim/Framework/IMoneyModule.cs
+++ b/OpenSim/Framework/IMoneyModule.cs
@@ -32,15 +32,16 @@ namespace OpenSim.Framework
    public delegate void ObjectPaid(UUID objectID, UUID agentID, int amount);
    public interface IMoneyModule
    {
-        bool ObjectGiveMoney(UUID objectID, UUID fromID, UUID toID,
+        bool ObjectGiveMoney(UUID objectID, UUID fromID,
-                int amount);
+                UUID toID, int amount, UUID txn, out string reason);
        int GetBalance(UUID agentID);
        bool UploadCovered(UUID agentID, int amount);
        bool AmountCovered(UUID agentID, int amount);
-        void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type);
+        void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData = "");
-        void ApplyCharge(UUID agentID, int amount, MoneyTransactionType type, string extraData);
        void ApplyUploadCharge(UUID agentID, int amount, string text);
+        void MoveMoney(UUID fromUser, UUID toUser, int amount, string text);
+        bool MoveMoney(UUID fromUser, UUID toUser, int amount, MoneyTransactionType type, string text);
        int UploadCharge { get; }
        int GroupCreationCharge { get; }
diff --git a/OpenSim/Framework/IPrimCounts.cs b/OpenSim/Framework/IPrimCounts.cs
index 3e12348..3b62ad3 100644
--- a/OpenSim/Framework/IPrimCounts.cs
+++ b/OpenSim/Framework/IPrimCounts.cs
@@ -35,12 +35,12 @@ namespace OpenSim.Framework
        /// Parcel owner owned prims
        /// </summary>
        int Owner { get; }
-        
        /// <summary>
        /// Parcel group owned prims
        /// </summary>
        int Group { get; }
-        
        /// <summary>
        /// Prims owned by others (not parcel owner or parcel group).
        /// </summary>
@@ -48,19 +48,19 @@ namespace OpenSim.Framework
        /// <summary>
        /// Selected prims
-        /// </summary>        
+        /// </summary>
-        int Selected { get; }        
+        int Selected { get; }
-        
        /// <summary>
        /// Total prims on the parcel.
        /// </summary>
        int Total { get; }
-        
        /// <summary>
        /// Prims on the simulator that are owned by the parcel owner, even if they are in other parcels.
        /// </summary>
        int Simulator { get; }
-        
        /// <summary>
        /// Prims per individual users.
        /// </summary>
diff --git a/OpenSim/Framework/IRegistryCore.cs b/OpenSim/Framework/IRegistryCore.cs
index a94b65d..cf3ecc0 100644
--- a/OpenSim/Framework/IRegistryCore.cs
+++ b/OpenSim/Framework/IRegistryCore.cs
@@ -31,7 +31,7 @@ using System.Text;
 namespace OpenSim.Framework
 {
-    public interface IRegistryCore 
+    public interface IRegistryCore
    {
        T Get<T>();
        void RegisterInterface<T>(T iface);
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index e1b6d1e..37a064f 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework
        Crashed = 2,
        Starting = 3,
    };
-            
    /// <value>
    /// Indicate what action to take on an object derez request
    /// </value>
@@ -118,7 +118,7 @@ namespace OpenSim.Framework
        /// </summary>
        /// <param name="mod"></param>
        void RegisterModuleInterface<M>(M mod);
-        
        void StackModuleInterface<M>(M mod);
        /// <summary>
diff --git a/OpenSim/Framework/ISceneAgent.cs b/OpenSim/Framework/ISceneAgent.cs
index ca1399c..5d70b83 100644
--- a/OpenSim/Framework/ISceneAgent.cs
+++ b/OpenSim/Framework/ISceneAgent.cs
@@ -55,6 +55,10 @@ namespace OpenSim.Framework
        /// </summary>
        bool IsChildAgent { get; }
+        bool IsInTransit { get; }
+        bool IsNPC { get;}
+        bool Invulnerable { get; set; }
        /// <summary>
        /// Avatar appearance data.
        /// </summary>
@@ -66,22 +70,17 @@ namespace OpenSim.Framework
        AvatarAppearance Appearance { get; set; }
        /// <summary>
-        /// Set if initial data about the scene (avatars, objects) has been sent to the client.
-        /// </summary>
-        bool SentInitialDataToClient { get; }
-        /// <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 SendInitialDataToClient();
+        void SendInitialDataToMe();
-        /// <summary>
+         /// <summary>
        /// Direction in which the scene presence is looking.
        /// </summary>
        /// <remarks>Will be Vector3.Zero for a child agent.</remarks>
-        Vector3 Lookat { get; }        
+        Vector3 Lookat { get; }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Framework/InventoryFolderImpl.cs b/OpenSim/Framework/InventoryFolderImpl.cs
index 139776b..d14f3be 100644
--- a/OpenSim/Framework/InventoryFolderImpl.cs
+++ b/OpenSim/Framework/InventoryFolderImpl.cs
@@ -314,7 +314,7 @@ namespace OpenSim.Framework
        /// XPath like expression
        ///
        /// FIXME: Delimitors which occur in names themselves are not currently escapable.
-        /// 
+        ///
        /// <param name="path">
        /// The path to the required folder.
        /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned.
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index f9fd752..c359a0c 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -34,17 +34,17 @@ namespace OpenSim.Framework
    /// Inventory Item - contains all the properties associated with an individual inventory piece.
    /// </summary>
    public class InventoryItemBase : InventoryNodeBase, ICloneable
-    {        
+    {
        /// <value>
        /// The inventory type of the item.  This is slightly different from the asset type in some situations.
        /// </value>
-        public int InvType 
+        public int InvType
-        { 
+        {
            get
            {
                return m_invType;
            }
-            
            set
            {
                m_invType = value;
@@ -55,13 +55,13 @@ namespace OpenSim.Framework
        /// <value>
        /// The folder this item is contained in
        /// </value>
-        public UUID Folder 
+        public UUID Folder
-        { 
+        {
            get
            {
                return m_folder;
            }
-            
            set
            {
                m_folder = value;
@@ -72,17 +72,17 @@ namespace OpenSim.Framework
        /// <value>
        /// The creator of this item
        /// </value>
-        public string CreatorId 
+        public string CreatorId
-        { 
+        {
            get
            {
-                return m_creatorId; 
+                return m_creatorId;
            }
-            
            set
            {
                m_creatorId = value;
-                
                if ((m_creatorId == null) || !UUID.TryParse(m_creatorId, out m_creatorIdAsUuid))
                    m_creatorIdAsUuid = UUID.Zero;
            }
@@ -92,7 +92,7 @@ namespace OpenSim.Framework
        /// <value>
        /// The CreatorId expressed as a UUID.
        /// </value>
-        public UUID CreatorIdAsUuid 
+        public UUID CreatorIdAsUuid
        {
            get
            {
@@ -161,13 +161,13 @@ namespace OpenSim.Framework
        /// <value>
        /// The description of the inventory item (must be less than 64 characters)
        /// </value>
-        public string Description 
+        public string Description
-        { 
+        {
            get
            {
                return m_description;
            }
-            
            set
            {
                m_description = value;
@@ -178,13 +178,13 @@ namespace OpenSim.Framework
        /// <value>
        ///
        /// </value>
-        public uint NextPermissions 
+        public uint NextPermissions
-        { 
+        {
            get
            {
                return m_nextPermissions;
            }
-            
            set
            {
                m_nextPermissions = value;
@@ -195,13 +195,13 @@ namespace OpenSim.Framework
        /// <value>
        /// A mask containing permissions for the current owner (cannot be enforced)
        /// </value>
-        public uint CurrentPermissions 
+        public uint CurrentPermissions
-        { 
+        {
            get
            {
                return m_currentPermissions;
            }
-            
            set
            {
                m_currentPermissions = value;
@@ -212,13 +212,13 @@ namespace OpenSim.Framework
        /// <value>
        ///
        /// </value>
-        public uint BasePermissions 
+        public uint BasePermissions
-        { 
+        {
            get
            {
                return m_basePermissions;
            }
-            
            set
            {
                m_basePermissions = value;
@@ -229,13 +229,13 @@ namespace OpenSim.Framework
        /// <value>
        ///
        /// </value>
-        public uint EveryOnePermissions 
+        public uint EveryOnePermissions
-        { 
+        {
            get
            {
                return m_everyonePermissions;
            }
-            
            set
            {
                m_everyonePermissions = value;
@@ -246,13 +246,13 @@ namespace OpenSim.Framework
        /// <value>
        ///
        /// </value>
-        public uint GroupPermissions 
+        public uint GroupPermissions
-        { 
+        {
            get
            {
                return m_groupPermissions;
            }
-            
            set
            {
                m_groupPermissions = value;
@@ -263,13 +263,13 @@ namespace OpenSim.Framework
        /// <value>
        /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
        /// </value>
-        public int AssetType 
+        public int AssetType
-        { 
+        {
            get
            {
                return m_assetType;
            }
-            
            set
            {
                m_assetType = value;
@@ -280,13 +280,13 @@ namespace OpenSim.Framework
        /// <value>
        /// The UUID of the associated asset on the asset server
        /// </value>
-        public UUID AssetID 
+        public UUID AssetID
-        { 
+        {
            get
            {
                return m_assetID;
            }
-            
            set
            {
                m_assetID = value;
@@ -297,13 +297,13 @@ namespace OpenSim.Framework
        /// <value>
        ///
        /// </value>
-        public UUID GroupID 
+        public UUID GroupID
-        { 
+        {
            get
            {
                return m_groupID;
            }
-            
            set
            {
                m_groupID = value;
@@ -314,13 +314,13 @@ namespace OpenSim.Framework
        /// <value>
        ///
        /// </value>
-        public bool GroupOwned 
+        public bool GroupOwned
-        { 
+        {
            get
            {
                return m_groupOwned;
            }
-                
            set
            {
                m_groupOwned = value;
@@ -331,13 +331,13 @@ namespace OpenSim.Framework
        /// <value>
        ///
        /// </value>
-        public int SalePrice 
+        public int SalePrice
-        { 
+        {
            get
            {
                return m_salePrice;
            }
-            
            set
            {
                m_salePrice = value;
@@ -348,13 +348,13 @@ namespace OpenSim.Framework
        /// <value>
        ///
        /// </value>
-        public byte SaleType 
+        public byte SaleType
-        { 
+        {
            get
            {
                return m_saleType;
            }
-            
            set
            {
                m_saleType = value;
@@ -365,13 +365,13 @@ namespace OpenSim.Framework
        /// <value>
        ///
        /// </value>
-        public uint Flags 
+        public uint Flags
-        { 
+        {
            get
            {
                return m_flags;
            }
-            
            set
            {
                m_flags = value;
@@ -382,13 +382,13 @@ namespace OpenSim.Framework
        /// <value>
        ///
        /// </value>
-        public int CreationDate 
+        public int CreationDate
-        { 
+        {
            get
            {
                return m_creationDate;
            }
-            
            set
            {
                m_creationDate = value;
diff --git a/OpenSim/Framework/InventoryNodeBase.cs b/OpenSim/Framework/InventoryNodeBase.cs
index 31c3fd1..9ef36b7 100644
--- a/OpenSim/Framework/InventoryNodeBase.cs
+++ b/OpenSim/Framework/InventoryNodeBase.cs
@@ -41,19 +41,19 @@ namespace OpenSim.Framework
        {
            get { return m_name; }
            set { m_name = value; }
-        } 
+        }
        private string m_name = string.Empty;
-        
        /// <summary>
        /// A UUID containing the ID for the inventory node itself
        /// </summary>
-        public UUID ID 
+        public UUID ID
        {
            get { return m_id; }
            set { m_id = value; }
        }
        private UUID m_id;
-        
        /// <summary>
        /// The agent who's inventory this is contained by
        /// </summary>
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index fc02f33..13b58be 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -67,11 +67,11 @@ namespace OpenSim.Framework
        private uint _flags = (uint)ParcelFlags.AllowFly | (uint)ParcelFlags.AllowLandmark |
                                (uint)ParcelFlags.AllowAPrimitiveEntry |
-                                (uint)ParcelFlags.AllowDeedToGroup | (uint)ParcelFlags.AllowTerraform |
+                                (uint)ParcelFlags.AllowDeedToGroup |
                                (uint)ParcelFlags.CreateObjects | (uint)ParcelFlags.AllowOtherScripts |
-                                (uint)ParcelFlags.SoundLocal | (uint)ParcelFlags.AllowVoiceChat;
+                                (uint)ParcelFlags.AllowVoiceChat;
-        private byte _landingType = 0;
+        private byte _landingType = (byte)OpenMetaverse.LandingType.Direct;
        private string _name = "Your Parcel";
        private ParcelStatus _status = ParcelStatus.Leased;
        private int _localID = 0;
@@ -97,7 +97,13 @@ namespace OpenSim.Framework
        private bool _mediaLoop = false;
        private bool _obscureMusic = false;
        private bool _obscureMedia = false;
-        private float _dwell = 0;
+        private float m_dwell = 0;
+        public double LastDwellTimeMS;
+        public bool SeeAVs { get; set; }
+        public bool AnyAVSounds { get; set; }
+        public bool GroupAVSounds { get; set; }
        /// <summary>
        /// Traffic count of parcel
@@ -107,11 +113,12 @@ namespace OpenSim.Framework
        {
            get
            {
-                return _dwell;
+                return m_dwell;
            }
            set
            {
-                _dwell = value;
+                m_dwell = value;
+                LastDwellTimeMS = Util.GetTimeStampMS();
            }
        }
@@ -407,7 +414,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Determines if people are able to teleport where they please on the parcel or if they 
+        /// Determines if people are able to teleport where they please on the parcel or if they
        /// get constrainted to a specific point on teleport within the parcel
        /// </summary>
        public byte LandingType
@@ -616,7 +623,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Number of meters^2 in the Simulator
+        /// Number of meters^2 that the land owner has in the Simulator
        /// </summary>
        [XmlIgnore]
        public int SimwideArea
@@ -663,7 +670,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// When teleporting is restricted to a certain point, this is the location 
+        /// When teleporting is restricted to a certain point, this is the location
        /// that the user will be redirected to
        /// </summary>
        public Vector3 UserLocation
@@ -679,7 +686,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// When teleporting is restricted to a certain point, this is the rotation 
+        /// When teleporting is restricted to a certain point, this is the rotation
        /// that the user will be positioned
        /// </summary>
        public Vector3 UserLookAt
@@ -695,7 +702,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own 
+        /// Autoreturn number of minutes to return SceneObjectGroup that are owned by someone who doesn't own
        /// the parcel and isn't set to the same 'group' as the parcel.
        /// </summary>
        public int OtherCleanTime
@@ -728,6 +735,10 @@ namespace OpenSim.Framework
        public LandData()
        {
            _globalID = UUID.Random();
+            SeeAVs = true;
+            AnyAVSounds = true;
+            GroupAVSounds = true;
+            LastDwellTimeMS = Util.GetTimeStampMS();
        }
        /// <summary>
@@ -777,7 +788,10 @@ namespace OpenSim.Framework
            landData._obscureMedia = _obscureMedia;
            landData._simwideArea = _simwideArea;
            landData._simwidePrims = _simwidePrims;
-            landData._dwell = _dwell;
+            landData.m_dwell = m_dwell;
+            landData.SeeAVs = SeeAVs;
+            landData.AnyAVSounds = AnyAVSounds;
+            landData.GroupAVSounds = GroupAVSounds;
            landData._parcelAccessList.Clear();
            foreach (LandAccessEntry entry in _parcelAccessList)
@@ -793,21 +807,21 @@ namespace OpenSim.Framework
            return landData;
        }
-        public void ToXml(XmlWriter xmlWriter)
+//        public void ToXml(XmlWriter xmlWriter)
-        {
+//        {
-            serializer.Serialize(xmlWriter, this);
+//            serializer.Serialize(xmlWriter, this);
-        }
+//        }
        /// <summary>
        /// Restore a LandData object from the serialized xml representation.
        /// </summary>
        /// <param name="xmlReader"></param>
        /// <returns></returns>
-        public static LandData FromXml(XmlReader xmlReader)
+//        public static LandData FromXml(XmlReader xmlReader)
-        {
+//        {
-            LandData land = (LandData)serializer.Deserialize(xmlReader);
+//            LandData land = (LandData)serializer.Deserialize(xmlReader);
+//
-            return land;
+//            return land;
-        }
+//        }
    }
 }
diff --git a/OpenSim/Framework/LandUpdateArgs.cs b/OpenSim/Framework/LandUpdateArgs.cs
index 7d6c4f2..a48b8bf 100644
--- a/OpenSim/Framework/LandUpdateArgs.cs
+++ b/OpenSim/Framework/LandUpdateArgs.cs
@@ -56,5 +56,8 @@ namespace OpenSim.Framework
        public bool MediaLoop;
        public bool ObscureMusic;
        public bool ObscureMedia;
+        public bool SeeAVs;
+        public bool AnyAVSounds;
+        public bool GroupAVSounds;
    }
 }
diff --git a/OpenSim/Framework/Lazy.cs b/OpenSim/Framework/Lazy.cs
index 91de4bd..ea07d0e 100644
--- a/OpenSim/Framework/Lazy.cs
+++ b/OpenSim/Framework/Lazy.cs
@@ -14,10 +14,10 @@
 // distribute, sublicense, and/or sell copies of the Software, and to
 // permit persons to whom the Software is furnished to do so, subject to
 // the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be
 // included in all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
diff --git a/OpenSim/Framework/LocklessQueue.cs b/OpenSim/Framework/LocklessQueue.cs
index 84f887c..21b8178 100644
--- a/OpenSim/Framework/LocklessQueue.cs
+++ b/OpenSim/Framework/LocklessQueue.cs
@@ -29,7 +29,7 @@ using System.Threading;
 namespace OpenSim.Framework
 {
-    public sealed class LocklessQueue<T>
+    public class LocklessQueue<T>
    {
        private sealed class SingleLinkNode
        {
@@ -41,7 +41,7 @@ namespace OpenSim.Framework
        SingleLinkNode tail;
        int count;
-        public int Count { get { return count; } }
+        public virtual int Count { get { return count; } }
        public LocklessQueue()
        {
@@ -76,7 +76,7 @@ namespace OpenSim.Framework
            Interlocked.Increment(ref count);
        }
-        public bool Dequeue(out T item)
+        public virtual bool Dequeue(out T item)
        {
            item = default(T);
            SingleLinkNode oldHead = null;
@@ -93,13 +93,16 @@ namespace OpenSim.Framework
                    if (oldHead == oldTail)
                    {
                        if (oldHeadNext == null)
+                        {
+                            count = 0;
                            return false;
+                        }
                        CAS(ref tail, oldTail, oldHeadNext);
                    }
                    else
                    {
-                        item = oldHeadNext.Item;                       
+                        item = oldHeadNext.Item;
                        haveAdvancedHead = CAS(ref head, oldHead, oldHeadNext);
                        if (haveAdvancedHead)
                        {
@@ -118,8 +121,7 @@ namespace OpenSim.Framework
        {
            // ugly
            T item;
-            while(count > 0)
+            while(Dequeue(out item));
-                Dequeue(out item);
            Init();
        }
@@ -136,4 +138,4 @@ namespace OpenSim.Framework
                (object)Interlocked.CompareExchange<SingleLinkNode>(ref location, newValue, comparand);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Framework/LogWriter.cs b/OpenSim/Framework/LogWriter.cs
index 2e0bf4a..2e0bf4a 100644..100755
--- a/OpenSim/Framework/LogWriter.cs
+++ b/OpenSim/Framework/LogWriter.cs
diff --git a/OpenSim/Framework/MapAndArray.cs b/OpenSim/Framework/MapAndArray.cs
index c98d3cc..32d6978 100644
--- a/OpenSim/Framework/MapAndArray.cs
+++ b/OpenSim/Framework/MapAndArray.cs
@@ -45,9 +45,9 @@ namespace OpenSim.Framework
        /// <summary>Number of values currently stored in the collection</summary>
        public int Count { get { return m_array.Length; } }
-        /// <summary>NOTE: This collection is thread safe. You do not need to 
+        /// <summary>NOTE: This collection is thread safe. You do not need to
-        /// acquire a lock to add, remove, or enumerate entries. This 
+        /// acquire a lock to add, remove, or enumerate entries. This
-        /// synchronization object should only be locked for larger 
+        /// synchronization object should only be locked for larger
        /// transactions</summary>
        public object SyncRoot { get { return m_syncRoot; } }
@@ -92,7 +92,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Adds a key/value pair to the collection. This will throw an 
+        /// Adds a key/value pair to the collection. This will throw an
        /// exception if the key is already present in the collection
        /// </summary>
        /// <param name="key">Key to add or update</param>
@@ -166,7 +166,7 @@ namespace OpenSim.Framework
        /// Gets a reference to the immutable array of values stored in this
        /// collection. This array is thread safe for iteration
        /// </summary>
-        /// <returns>A thread safe reference ton an array of all of the stored 
+        /// <returns>A thread safe reference ton an array of all of the stored
        /// values</returns>
        public TValue[] GetArray()
        {
@@ -175,7 +175,7 @@ namespace OpenSim.Framework
        private void CreateArray()
        {
-            // Rebuild the array from the dictionary. This method must be 
+            // Rebuild the array from the dictionary. This method must be
            // called from inside a lock
            TValue[] array = new TValue[m_dict.Count];
            int i = 0;
diff --git a/OpenSim/Framework/MapItemReplyStruct.cs b/OpenSim/Framework/MapItemReplyStruct.cs
index c8693ae..348a240 100644
--- a/OpenSim/Framework/MapItemReplyStruct.cs
+++ b/OpenSim/Framework/MapItemReplyStruct.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Framework
            map["Extra2"] = OSD.FromInteger(Extra2);
            return map;
        }
-        
        public void FromOSD(OSDMap map)
        {
            x = (uint) map["X"].AsInteger();
diff --git a/OpenSim/Framework/MetricsCollector.cs b/OpenSim/Framework/MetricsCollector.cs
index c8f4a33..391f57e 100644
--- a/OpenSim/Framework/MetricsCollector.cs
+++ b/OpenSim/Framework/MetricsCollector.cs
@@ -42,23 +42,23 @@ namespace OpenSim.Framework
        }
    }
-    
    struct MetricsBucket<T>
    {
        public T value;
        public int count;
    }
-    
    /// <summary>
    /// Collects metrics in a sliding window.
    /// </summary>
    /// <remarks>
    /// MetricsCollector provides the current Sum of the metrics that it collects. It can easily be extended
    /// to provide the Average, too. It uses a sliding window to keep these values current.
-    /// 
+    ///
    /// This class is not thread-safe.
-    /// 
+    ///
    /// Subclass MetricsCollector to have it use a concrete value type. Override the abstract methods.
    /// </remarks>
    public abstract class MetricsCollector<T>
diff --git a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
index 20495f6..e513abd 100644
--- a/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/BaseStatsCollector.cs
@@ -43,7 +43,6 @@ namespace OpenSim.Framework.Monitoring
            StringBuilder sb = new StringBuilder(Environment.NewLine);
            sb.Append("MEMORY STATISTICS");
            sb.Append(Environment.NewLine);
            sb.AppendFormat(
                "Heap allocated to OpenSim   : {0} MB\n",
                Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0));
@@ -56,13 +55,30 @@ namespace OpenSim.Framework.Monitoring
                "Average heap allocation rate: {0} MB/s\n",
                Math.Round((MemoryWatchdog.AverageHeapAllocationRate * 1000) / 1024.0 / 1024, 3));
-            sb.AppendFormat(
+            Process myprocess = Process.GetCurrentProcess();
-                "Process memory              : {0} MB\n",
+//            if (!myprocess.HasExited)
-                Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0));
+            try
+            {
+                myprocess.Refresh();
+                sb.AppendFormat(
+                        "Process memory:      Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n",
+                        Math.Round(myprocess.WorkingSet64 / 1024.0 / 1024.0),
+                        Math.Round(myprocess.PagedMemorySize64 / 1024.0 / 1024.0),
+                        Math.Round(myprocess.VirtualMemorySize64 / 1024.0 / 1024.0));
+                sb.AppendFormat(
+                        "Peak process memory: Physical {0} MB \t Paged {1} MB \t Virtual {2} MB\n",
+                        Math.Round(myprocess.PeakWorkingSet64 / 1024.0 / 1024.0),
+                        Math.Round(myprocess.PeakPagedMemorySize64 / 1024.0 / 1024.0),
+                        Math.Round(myprocess.PeakVirtualMemorySize64 / 1024.0 / 1024.0));
+            }
+            catch
+            { }
+//            else
+//                sb.Append("Process reported as Exited \n");
            return sb.ToString();
        }
-        
        public virtual string XReport(string uptime, string version)
        {
            return (string) Math.Round(GC.GetTotalMemory(false) / 1024.0 / 1024.0).ToString() ;
diff --git a/OpenSim/Framework/Monitoring/Checks/Check.cs b/OpenSim/Framework/Monitoring/Checks/Check.cs
index 594386a..9a1bd45 100644
--- a/OpenSim/Framework/Monitoring/Checks/Check.cs
+++ b/OpenSim/Framework/Monitoring/Checks/Check.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Monitoring
            string category,
            string container,
            Func<Check, bool> checkFunc,
-            StatVerbosity verbosity) 
+            StatVerbosity verbosity)
        {
            if (ChecksManager.SubCommands.Contains(category))
                throw new Exception(
@@ -108,9 +108,9 @@ namespace OpenSim.Framework.Monitoring
        public virtual string ToConsoleString()
        {
            return string.Format(
-                "{0}.{1}.{2} - {3}", 
+                "{0}.{1}.{2} - {3}",
-                Category, 
+                Category,
-                Container, 
+                Container,
                ShortName,
                Description);
        }
diff --git a/OpenSim/Framework/Monitoring/ChecksManager.cs b/OpenSim/Framework/Monitoring/ChecksManager.cs
index e4a7f8c..ff3b041 100644
--- a/OpenSim/Framework/Monitoring/ChecksManager.cs
+++ b/OpenSim/Framework/Monitoring/ChecksManager.cs
@@ -132,8 +132,8 @@ namespace OpenSim.Framework.Monitoring
        /// <returns></returns>
        public static bool RegisterCheck(Check check)
        {
-            SortedDictionary<string, SortedDictionary<string, Check>> category = null, newCategory;
+            SortedDictionary<string, SortedDictionary<string, Check>> category = null;
-            SortedDictionary<string, Check> container = null, newContainer;
+            SortedDictionary<string, Check> container = null;
            lock (RegisteredChecks)
            {
@@ -146,19 +146,15 @@ namespace OpenSim.Framework.Monitoring
                // We take a copy-on-write approach here of replacing dictionaries when keys are added or removed.
                // This means that we don't need to lock or copy them on iteration, which will be a much more
                // common operation after startup.
-                if (container != null)
+                if (container == null)
-                    newContainer = new SortedDictionary<string, Check>(container);
+                    container = new SortedDictionary<string, Check>();
-                else
-                    newContainer = new SortedDictionary<string, Check>();
-                if (category != null)
+                if (category == null)
-                    newCategory = new SortedDictionary<string, SortedDictionary<string, Check>>(category);
+                    category = new SortedDictionary<string, SortedDictionary<string, Check>>();
-                else
-                    newCategory = new SortedDictionary<string, SortedDictionary<string, Check>>();
-                newContainer[check.ShortName] = check;
+                container[check.ShortName] = check;
-                newCategory[check.Container] = newContainer;
+                category[check.Container] = container;
-                RegisteredChecks[check.Category] = newCategory;
+                RegisteredChecks[check.Category] = category;
            }
            return true;
@@ -171,23 +167,24 @@ namespace OpenSim.Framework.Monitoring
        /// <returns></returns>
        public static bool DeregisterCheck(Check check)
        {
-            SortedDictionary<string, SortedDictionary<string, Check>> category = null, newCategory;
+            SortedDictionary<string, SortedDictionary<string, Check>> category = null;
-            SortedDictionary<string, Check> container = null, newContainer;
+            SortedDictionary<string, Check> container = null;
            lock (RegisteredChecks)
            {
                if (!TryGetCheckParents(check, out category, out container))
                    return false;
-                newContainer = new SortedDictionary<string, Check>(container);
+                if(container != null)
-                newContainer.Remove(check.ShortName);
+                {
+                    container.Remove(check.ShortName);
-                newCategory = new SortedDictionary<string, SortedDictionary<string, Check>>(category);
+                    if(category != null && container.Count == 0)
-                newCategory.Remove(check.Container);
+                    {
+                        category.Remove(check.Container);
-                newCategory[check.Container] = newContainer;
+                        if(category.Count == 0)
-                RegisteredChecks[check.Category] = newCategory;
+                            RegisteredChecks.Remove(check.Category);
+                    }
+                }
                return true;
            }
        }
diff --git a/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs b/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs
index 40df562..e326e8b 100644
--- a/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/Interfaces/IStatsCollector.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Monitoring
        /// </summary>
        /// <returns></returns>
        string Report();
-         
        /// <summary>
        /// Report back collected statistical information in json
        /// </summary>
diff --git a/OpenSim/Framework/Monitoring/JobEngine.cs b/OpenSim/Framework/Monitoring/JobEngine.cs
index 6db9a67..115871e 100644
--- a/OpenSim/Framework/Monitoring/JobEngine.cs
+++ b/OpenSim/Framework/Monitoring/JobEngine.cs
@@ -40,6 +40,8 @@ namespace OpenSim.Framework.Monitoring
        public int LogLevel { get; set; }
+        private object JobLock = new object();
        public string Name { get; private set; }
        public string LoggingName { get; private set; }
@@ -47,7 +49,7 @@ namespace OpenSim.Framework.Monitoring
        /// <summary>
        /// Is this engine running?
        /// </summary>
-        public bool IsRunning { get; private set; } 
+        public bool IsRunning { get; private set; }
        /// <summary>
        /// The current job that the engine is running.
@@ -55,7 +57,8 @@ namespace OpenSim.Framework.Monitoring
        /// <remarks>
        /// Will be null if no job is currently running.
        /// </remarks>
-        public Job CurrentJob { get; private set; }
+        private Job m_currentJob;
+        public Job CurrentJob { get { return m_currentJob;} }
        /// <summary>
        /// Number of jobs waiting to be processed.
@@ -71,96 +74,64 @@ namespace OpenSim.Framework.Monitoring
        /// Controls whether we need to warn in the log about exceeding the max queue size.
        /// </summary>
        /// <remarks>
-        /// This is flipped to false once queue max has been exceeded and back to true when it falls below max, in 
+        /// This is flipped to false once queue max has been exceeded and back to true when it falls below max, in
        /// order to avoid spamming the log with lots of warnings.
        /// </remarks>
        private bool m_warnOverMaxQueue = true;
-        private BlockingCollection<Job> m_jobQueue;
+        private BlockingCollection<Job> m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000);
        private CancellationTokenSource m_cancelSource;
-        /// <summary>
+        private int m_timeout = -1;
-        /// Used to signal that we are ready to complete stop.
-        /// </summary>
-        private ManualResetEvent m_finishedProcessingAfterStop = new ManualResetEvent(false);
-        public JobEngine(string name, string loggingName)
+        private bool m_threadRunnig = false;
+        public JobEngine(string name, string loggingName, int timeout = -1)
        {
            Name = name;
            LoggingName = loggingName;
+            m_timeout = timeout;
            RequestProcessTimeoutOnStop = 5000;
        }
        public void Start()
        {
-            lock (this)
+            lock (JobLock)
            {
                if (IsRunning)
                    return;
                IsRunning = true;
-                m_finishedProcessingAfterStop.Reset();
-                m_jobQueue = new BlockingCollection<Job>(new ConcurrentQueue<Job>(), 5000);
                m_cancelSource = new CancellationTokenSource();
+                WorkManager.RunInThreadPool(ProcessRequests, null, Name, false);
-                WorkManager.StartThread(
+                m_threadRunnig = true;
-                    ProcessRequests,
-                    Name,
-                    ThreadPriority.Normal,
-                    false,
-                    true,
-                    null,
-                    int.MaxValue);
            }
        }
        public void Stop()
-        {   
+        {
-            lock (this)
+            lock (JobLock)
            {
                try
                {
                    if (!IsRunning)
                        return;
-                    IsRunning = false;
+                    m_log.DebugFormat("[JobEngine] Stopping {0}", Name);
-                    int requestsLeft = m_jobQueue.Count;
+                    IsRunning = false;
+                    if(m_threadRunnig)
-                    if (requestsLeft <= 0)
                    {
                        m_cancelSource.Cancel();
-                    }
+                        m_threadRunnig = false;
-                    else 
-                    {
-                        m_log.InfoFormat("[{0}]: Waiting to write {1} events after stop.", LoggingName, requestsLeft);
-                        while (requestsLeft > 0)
-                        {
-                            if (!m_finishedProcessingAfterStop.WaitOne(RequestProcessTimeoutOnStop))
-                            {
-                                // After timeout no events have been written
-                                if (requestsLeft == m_jobQueue.Count)
-                                {
-                                    m_log.WarnFormat(
-                                        "[{0}]: No requests processed after {1} ms wait.  Discarding remaining {2} requests", 
-                                        LoggingName, RequestProcessTimeoutOnStop, requestsLeft);
-                                    break;
-                                }
-                            }
-                            requestsLeft = m_jobQueue.Count;
-                        }
                    }
                }
                finally
                {
-                    m_cancelSource.Dispose();
+                    if(m_cancelSource != null)
+                        m_cancelSource.Dispose();
                }
            }
        }
@@ -169,7 +140,7 @@ namespace OpenSim.Framework.Monitoring
        /// Make a job.
        /// </summary>
        /// <remarks>
-        /// We provide this method to replace the constructor so that we can later pool job objects if necessary to 
+        /// We provide this method to replace the constructor so that we can later pool job objects if necessary to
        /// reduce memory churn.  Normally one would directly call QueueJob() with parameters anyway.
        /// </remarks>
        /// <returns></returns>
@@ -219,6 +190,18 @@ namespace OpenSim.Framework.Monitoring
        /// </param>
        public bool QueueJob(Job job)
        {
+            lock(JobLock)
+            {
+                if(!IsRunning)
+                    return false;
+                
+                if(!m_threadRunnig)
+                {
+                     WorkManager.RunInThreadPool(ProcessRequests, null, Name, false);
+                     m_threadRunnig = true;
+                }
+            }
            if (m_jobQueue.Count < m_jobQueue.BoundedCapacity)
            {
                m_jobQueue.Add(job);
@@ -238,56 +221,53 @@ namespace OpenSim.Framework.Monitoring
                    m_warnOverMaxQueue = false;
                }
                return false;
            }
        }
-        private void ProcessRequests()
+        private void ProcessRequests(Object o)
        {
-            try
+            while(IsRunning)
            {
-                while (IsRunning || m_jobQueue.Count > 0)
+                try
                {
-                    try
+                    if(!m_jobQueue.TryTake(out m_currentJob, m_timeout, m_cancelSource.Token))
                    {
-                        CurrentJob = m_jobQueue.Take(m_cancelSource.Token);
+                        lock(JobLock)
-                    }
+                            m_threadRunnig = false;
-                    catch (ObjectDisposedException e)
+                        break;
-                    {
-                        // If we see this whilst not running then it may be due to a race where this thread checks
-                        // IsRunning after the stopping thread sets it to false and disposes of the cancellation source.
-                        if (IsRunning)
-                            throw e;
-                        else
-                            break;
                    }
+                }
+                catch(ObjectDisposedException e)
+                {
+                    m_log.DebugFormat("[JobEngine] {0} stopping ignoring {1} jobs in queue",
+                        Name,m_jobQueue.Count);
+                    break;
+                }
+                catch(OperationCanceledException)
+                {
+                    break;
+                }
-                    if (LogLevel >= 1)
+                if(LogLevel >= 1)
-                        m_log.DebugFormat("[{0}]: Processing job {1}", LoggingName, CurrentJob.Name);
+                    m_log.DebugFormat("[{0}]: Processing job {1}",LoggingName,m_currentJob.Name);
-                    try
+                try
-                    {
+                {
-                        CurrentJob.Action();
+                    m_currentJob.Action();
-                    }
+                }
-                    catch (Exception e)
+                catch(Exception e)
-                    {
+                {
-                        m_log.Error(
+                    m_log.Error(
-                            string.Format(
+                        string.Format(
-                            "[{0}]: Job {1} failed, continuing.  Exception  ", LoggingName, CurrentJob.Name), e);
+                        "[{0}]: Job {1} failed, continuing.  Exception  ",LoggingName,m_currentJob.Name),e);
-                    }
+                }
-                    if (LogLevel >= 1)
+                if(LogLevel >= 1)
-                        m_log.DebugFormat("[{0}]: Processed job {1}", LoggingName, CurrentJob.Name);
+                    m_log.DebugFormat("[{0}]: Processed job {1}",LoggingName,m_currentJob.Name);
-                    CurrentJob = null;
+                m_currentJob = null;
-                }
-            }
-            catch (OperationCanceledException)
-            {
            }
-            m_finishedProcessingAfterStop.Set();
        }
        public class Job
@@ -320,7 +300,7 @@ namespace OpenSim.Framework.Monitoring
                CommonId = commonId;
                Action = action;
            }
-                        
            /// <summary>
            /// Make a job.  It needs to be separately queued.
            /// </summary>
@@ -338,4 +318,4 @@ namespace OpenSim.Framework.Monitoring
            }
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs b/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs
index a617b93..2ff2014 100644
--- a/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Monitoring/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Framework.Monitoring")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
+// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from 
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
@@ -25,9 +25,9 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.3.*")]
+[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
diff --git a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
index 77315bb..a26a6e0 100644
--- a/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/ServerStatsCollector.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Monitoring
            IConfig cfg = source.Configs["Monitoring"];
            if (cfg != null)
-                Enabled = cfg.GetBoolean("ServerStatsEnabled", true);
+                Enabled = cfg.GetBoolean("ServerStatsEnabled", false);
            if (Enabled)
            {
@@ -98,12 +98,18 @@ namespace OpenSim.Framework.Monitoring
        public void Start()
        {
+            if(!Enabled)
+                return;
            if (RegisteredStats.Count == 0)
                RegisterServerStats();
        }
        public void Close()
        {
+            if(!Enabled)
+                return;
            if (RegisteredStats.Count > 0)
            {
                foreach (Stat stat in RegisteredStats.Values)
@@ -167,18 +173,18 @@ namespace OpenSim.Framework.Monitoring
            }
            MakeStat("BuiltinThreadpoolWorkerThreadsAvailable", null, "threads", ContainerThreadpool,
-                s => 
+                s =>
-                { 
+                {
-                    int workerThreads, iocpThreads; 
+                    int workerThreads, iocpThreads;
-                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); 
+                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
                    s.Value = workerThreads;
                });
            MakeStat("BuiltinThreadpoolIOCPThreadsAvailable", null, "threads", ContainerThreadpool,
-                s => 
+                s =>
-                { 
+                {
-                    int workerThreads, iocpThreads; 
+                    int workerThreads, iocpThreads;
-                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads); 
+                    ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
                    s.Value = iocpThreads;
                });
@@ -193,10 +199,10 @@ namespace OpenSim.Framework.Monitoring
            }
            MakeStat(
-                "HTTPRequestsMade", 
+                "HTTPRequestsMade",
-                "Number of outbound HTTP requests made", 
+                "Number of outbound HTTP requests made",
-                "requests", 
+                "requests",
-                ContainerNetwork, 
+                ContainerNetwork,
                s => s.Value = WebUtil.RequestNumber,
                MeasuresOfInterest.AverageChangeOverTime);
@@ -249,9 +255,52 @@ namespace OpenSim.Framework.Monitoring
                                (s) => { s.Value = Math.Round(MemoryWatchdog.LastHeapAllocationRate * 1000d / 1024d / 1024d, 3); });
            MakeStat("AverageHeapAllocationRate", null, "MB/sec", ContainerMemory,
                                (s) => { s.Value = Math.Round(MemoryWatchdog.AverageHeapAllocationRate * 1000d / 1024d / 1024d, 3); });
+            MakeStat("ProcessResident", null, "MB", ContainerProcess,
+                                (s) =>
+                                {
+                                    Process myprocess = Process.GetCurrentProcess();
+                                    myprocess.Refresh();
+                                    s.Value = Math.Round(Process.GetCurrentProcess().WorkingSet64 / 1024.0 / 1024.0);
+                                });
+            MakeStat("ProcessPaged", null, "MB", ContainerProcess,
+                                (s) =>
+                                {
+                                    Process myprocess = Process.GetCurrentProcess();
+                                    myprocess.Refresh();
+                                    s.Value = Math.Round(Process.GetCurrentProcess().PagedMemorySize64 / 1024.0 / 1024.0);
+                                });
+            MakeStat("ProcessVirtual", null, "MB", ContainerProcess,
+                                (s) =>
+                                {
+                                    Process myprocess = Process.GetCurrentProcess();
+                                    myprocess.Refresh();
+                                    s.Value = Math.Round(Process.GetCurrentProcess().VirtualMemorySize64 / 1024.0 / 1024.0);
+                                });
+            MakeStat("PeakProcessResident", null, "MB", ContainerProcess,
+                                (s) =>
+                                {
+                                    Process myprocess = Process.GetCurrentProcess();
+                                    myprocess.Refresh();
+                                    s.Value = Math.Round(Process.GetCurrentProcess().PeakWorkingSet64 / 1024.0 / 1024.0);
+                                });
+            MakeStat("PeakProcessPaged", null, "MB", ContainerProcess,
+                                (s) =>
+                                {
+                                    Process myprocess = Process.GetCurrentProcess();
+                                    myprocess.Refresh();
+                                    s.Value = Math.Round(Process.GetCurrentProcess().PeakPagedMemorySize64 / 1024.0 / 1024.0);
+                                });
+            MakeStat("PeakProcessVirtual", null, "MB", ContainerProcess,
+                                (s) =>
+                                {
+                                    Process myprocess = Process.GetCurrentProcess();
+                                    myprocess.Refresh();
+                                    s.Value = Math.Round(Process.GetCurrentProcess().PeakVirtualMemorySize64 / 1024.0 / 1024.0);
+                                });
        }
-        // Notes on performance counters: 
+        // Notes on performance counters:
        //  "How To Read Performance Counters": http://blogs.msdn.com/b/bclteam/archive/2006/06/02/618156.aspx
        //  "How to get the CPU Usage in C#": http://stackoverflow.com/questions/278071/how-to-get-the-cpu-usage-in-c
        //  "Mono Performance Counters": http://www.mono-project.com/Mono_Performance_Counters
diff --git a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
index e4df7ee..88a0297 100644..100755
--- a/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
+++ b/OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
@@ -34,6 +34,7 @@ using OpenMetaverse;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework.Monitoring.Interfaces;
 namespace OpenSim.Framework.Monitoring
 {
    /// <summary>
@@ -71,6 +72,11 @@ namespace OpenSim.Framework.Monitoring
        private volatile float pendingDownloads;
        private volatile float pendingUploads;
        private volatile float activeScripts;
+        private volatile float spareTime;
+        private volatile float sleepTime;
+        private volatile float physicsStep;
        private volatile float scriptLinesPerSecond;
        private volatile float m_frameDilation;
        private volatile float m_usersLoggingIn;
@@ -84,17 +90,17 @@ namespace OpenSim.Framework.Monitoring
 //        /// haven't yet been implemented...
 //        /// </summary>
 //        public long AssetsInCache { get { return assetsInCache; } }
-//        
+//
 //        /// <value>
 //        /// Currently unused
 //        /// </value>
 //        public long TexturesInCache { get { return texturesInCache; } }
-//        
+//
 //        /// <value>
 //        /// Currently misleading since we can't currently subtract removed asset memory usage without a performance hit
 //        /// </value>
 //        public long AssetCacheMemoryUsage { get { return assetCacheMemoryUsage; } }
-//        
+//
 //        /// <value>
 //        /// Currently unused
 //        /// </value>
@@ -121,7 +127,7 @@ namespace OpenSim.Framework.Monitoring
        public float PendingUploads { get { return pendingUploads; } }
        public float ActiveScripts { get { return activeScripts; } }
        public float ScriptLinesPerSecond { get { return scriptLinesPerSecond; } }
-        
 //        /// <summary>
 //        /// This is the time it took for the last asset request made in response to a cache miss.
 //        /// </summary>
@@ -171,7 +177,7 @@ namespace OpenSim.Framework.Monitoring
 //            assetsInCache++;
 //            //assetCacheMemoryUsage += asset.Data.Length;
 //        }
-//        
+//
 //        public void RemoveAsset(UUID uuid)
 //        {
 //            assetsInCache--;
@@ -198,7 +204,7 @@ namespace OpenSim.Framework.Monitoring
 //            texturesInCache = 0;
 //            textureCacheMemoryUsage = 0;
 //        }
-//        
+//
 //        public void AddAssetRequestTimeAfterCacheMiss(TimeSpan ts)
 //        {
 //            assetRequestTimeAfterCacheMiss = ts;
@@ -253,7 +259,7 @@ namespace OpenSim.Framework.Monitoring
        /// <param name="pack"></param>
        public void ReceiveClassicSimStatsPacket(SimStats stats)
        {
-            // FIXME: SimStats shouldn't allow an arbitrary stat packing order (which is inherited from the original
+             // FIXME: SimStats shouldn't allow an arbitrary stat packing order (which is inherited from the original
            // SimStatsPacket that was being used).
            // For an unknown reason the original designers decided not to
@@ -270,8 +276,8 @@ namespace OpenSim.Framework.Monitoring
            totalFrameTime          = stats.StatsBlock[8].StatValue;
            netFrameTime            = stats.StatsBlock[9].StatValue;
            physicsFrameTime        = stats.StatsBlock[10].StatValue;
-            otherFrameTime          = stats.StatsBlock[11].StatValue;
+            imageFrameTime          = stats.StatsBlock[11].StatValue;
-            imageFrameTime          = stats.StatsBlock[12].StatValue;
+            otherFrameTime          = stats.StatsBlock[12].StatValue;
            inPacketsPerSecond      = stats.StatsBlock[13].StatValue;
            outPacketsPerSecond     = stats.StatsBlock[14].StatValue;
            unackedBytes            = stats.StatsBlock[15].StatValue;
@@ -279,12 +285,16 @@ namespace OpenSim.Framework.Monitoring
            pendingDownloads        = stats.StatsBlock[17].StatValue;
            pendingUploads          = stats.StatsBlock[18].StatValue;
            activeScripts           = stats.StatsBlock[19].StatValue;
-            scriptLinesPerSecond    = stats.StatsBlock[20].StatValue;
+            sleepTime               = stats.StatsBlock[20].StatValue;
-            m_frameDilation         = stats.StatsBlock[22].StatValue;
+            spareTime               = stats.StatsBlock[21].StatValue;
-            m_usersLoggingIn        = stats.StatsBlock[23].StatValue;
+            physicsStep             = stats.StatsBlock[22].StatValue;
-            m_totalGeoPrims         = stats.StatsBlock[24].StatValue;
-            m_totalMeshes           = stats.StatsBlock[25].StatValue;
+            scriptLinesPerSecond    = stats.ExtraStatsBlock[0].StatValue;
-            m_inUseThreads          = stats.StatsBlock[26].StatValue;
+            m_frameDilation         = stats.ExtraStatsBlock[1].StatValue;
+            m_usersLoggingIn        = stats.ExtraStatsBlock[2].StatValue;
+            m_totalGeoPrims         = stats.ExtraStatsBlock[3].StatValue;
+            m_totalMeshes           = stats.ExtraStatsBlock[4].StatValue;
+            m_inUseThreads          = stats.ExtraStatsBlock[5].StatValue;
        }
        /// <summary>
@@ -296,7 +306,7 @@ namespace OpenSim.Framework.Monitoring
            StringBuilder sb = new StringBuilder(Environment.NewLine);
 //            sb.Append("ASSET STATISTICS");
 //            sb.Append(Environment.NewLine);
-                        
            /*
            sb.Append(
                string.Format(
@@ -332,7 +342,7 @@ Asset service request failures: {3}" + Environment.NewLine,
            List<Stat> stats = StatsManager.GetStatsFromEachContainer("clientstack", "ClientLogoutsDueToNoReceives");
            sb.AppendFormat(
-                "Client logouts due to no data receive timeout: {0}\n\n", 
+                "Client logouts due to no data receive timeout: {0}\n\n",
                stats != null ? stats.Sum(s => s.Value).ToString() : "unknown");
 //            sb.Append(Environment.NewLine);
@@ -433,10 +443,10 @@ Asset service request failures: {3}" + Environment.NewLine,
            foreach (ProcessThread currentThread in
                Process.GetCurrentProcess().Threads)
            {
-                // A known issue with the current process .Threads property is 
+                // A known issue with the current process .Threads property is
-                // that it can return null threads, thus don't count those as 
+                // that it can return null threads, thus don't count those as
                // running threads and prevent the program function from failing
-                if (currentThread != null && 
+                if (currentThread != null &&
                    currentThread.ThreadState == ThreadState.Running)
                {
                    numberThreadsRunning++;
@@ -495,7 +505,7 @@ Asset service request failures: {3}" + Environment.NewLine,
                "{0:0.##}", numberThreadsRunning));
            args["ProcMem"] = OSD.FromString(String.Format("{0:#,###,###.##}",
                memUsage));
-            
            return args;
        }
    }
@@ -521,12 +531,12 @@ Asset service request failures: {3}" + Environment.NewLine,
        {
            return m_statsProvider.GetStats();
        }
-        
        public string XReport(string uptime, string version)
        {
            return "";
        }
-        
        public OSDMap OReport(string uptime, string version)
        {
            OSDMap ret = new OSDMap();
diff --git a/OpenSim/Framework/Monitoring/Stats/CounterStat.cs b/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
index 318cf1c..318cf1c 100644..100755
--- a/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/CounterStat.cs
diff --git a/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs b/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs
index f51f322..bc56372 100644..100755
--- a/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs
+++ b/OpenSim/Framework/Monitoring/Stats/EventHistogram.cs
@@ -1,173 +1,173 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
+ *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using System.Text;
+using System.Text;
-using OpenMetaverse.StructuredData;
+using OpenMetaverse.StructuredData;
-namespace OpenSim.Framework.Monitoring
+namespace OpenSim.Framework.Monitoring
-{
+{
-// Create a time histogram of events. The histogram is built in a wrap-around
+// Create a time histogram of events. The histogram is built in a wrap-around
-//   array of equally distributed buckets.
+//   array of equally distributed buckets.
-// For instance, a minute long histogram of second sized buckets would be:
+// For instance, a minute long histogram of second sized buckets would be:
-//          new EventHistogram(60, 1000)
+//          new EventHistogram(60, 1000)
-public class EventHistogram
+public class EventHistogram
-{
+{
-    private int m_timeBase;
+    private int m_timeBase;
-    private int m_numBuckets;
+    private int m_numBuckets;
-    private int m_bucketMilliseconds;
+    private int m_bucketMilliseconds;
-    private int m_lastBucket;
+    private int m_lastBucket;
-    private int m_totalHistogramMilliseconds;
+    private int m_totalHistogramMilliseconds;
-    private long[] m_histogram;
+    private long[] m_histogram;
-    private object histoLock = new object();
+    private object histoLock = new object();
-    public EventHistogram(int numberOfBuckets, int millisecondsPerBucket)
+    public EventHistogram(int numberOfBuckets, int millisecondsPerBucket)
-    {
+    {
-        m_numBuckets = numberOfBuckets;
+        m_numBuckets = numberOfBuckets;
-        m_bucketMilliseconds = millisecondsPerBucket;
+        m_bucketMilliseconds = millisecondsPerBucket;
-        m_totalHistogramMilliseconds = m_numBuckets * m_bucketMilliseconds;
+        m_totalHistogramMilliseconds = m_numBuckets * m_bucketMilliseconds;
-        m_histogram = new long[m_numBuckets];
+        m_histogram = new long[m_numBuckets];
-        Zero();
+        Zero();
-        m_lastBucket = 0;
+        m_lastBucket = 0;
-        m_timeBase = Util.EnvironmentTickCount();
+        m_timeBase = Util.EnvironmentTickCount();
-    }
+    }
-    public void Event()
+    public void Event()
-    {
+    {
-        this.Event(1);
+        this.Event(1);
-    }
+    }
-    // Record an event at time 'now' in the histogram.
+    // Record an event at time 'now' in the histogram.
-    public void Event(int cnt)
+    public void Event(int cnt)
-    {
+    {
-        lock (histoLock)
+        lock (histoLock)
-        {
+        {
-            // The time as displaced from the base of the histogram
+            // The time as displaced from the base of the histogram
-            int bucketTime = Util.EnvironmentTickCountSubtract(m_timeBase);
+            int bucketTime = Util.EnvironmentTickCountSubtract(m_timeBase);
-            // If more than the total time of the histogram, we just start over
+            // If more than the total time of the histogram, we just start over
-            if (bucketTime > m_totalHistogramMilliseconds)
+            if (bucketTime > m_totalHistogramMilliseconds)
-            {
+            {
-                Zero();
+                Zero();
-                m_lastBucket = 0;
+                m_lastBucket = 0;
-                m_timeBase = Util.EnvironmentTickCount();
+                m_timeBase = Util.EnvironmentTickCount();
-            }
+            }
-            else
+            else
-            {
+            {
-                // To which bucket should we add this event?
+                // To which bucket should we add this event?
-                int bucket = bucketTime / m_bucketMilliseconds;
+                int bucket = bucketTime / m_bucketMilliseconds;
-                // Advance m_lastBucket to the new bucket. Zero any buckets skipped over.
+                // Advance m_lastBucket to the new bucket. Zero any buckets skipped over.
-                while (bucket != m_lastBucket)
+                while (bucket != m_lastBucket)
-                {
+                {
-                    // Zero from just after the last bucket to the new bucket or the end
+                    // Zero from just after the last bucket to the new bucket or the end
-                    for (int jj = m_lastBucket + 1; jj <= Math.Min(bucket, m_numBuckets - 1); jj++)
+                    for (int jj = m_lastBucket + 1; jj <= Math.Min(bucket, m_numBuckets - 1); jj++)
-                    {
+                    {
-                        m_histogram[jj] = 0;
+                        m_histogram[jj] = 0;
-                    }
+                    }
-                    m_lastBucket = bucket;
+                    m_lastBucket = bucket;
-                    // If the new bucket is off the end, wrap around to the beginning
+                    // If the new bucket is off the end, wrap around to the beginning
-                    if (bucket > m_numBuckets)
+                    if (bucket > m_numBuckets)
-                    {
+                    {
-                        bucket -= m_numBuckets;
+                        bucket -= m_numBuckets;
-                        m_lastBucket = 0;
+                        m_lastBucket = 0;
-                        m_histogram[m_lastBucket] = 0;
+                        m_histogram[m_lastBucket] = 0;
-                        m_timeBase += m_totalHistogramMilliseconds;
+                        m_timeBase += m_totalHistogramMilliseconds;
-                    }
+                    }
-                }
+                }
-            }
+            }
-            m_histogram[m_lastBucket] += cnt;
+            m_histogram[m_lastBucket] += cnt;
-        }
+        }
-    }
+    }
-    // Get a copy of the current histogram
+    // Get a copy of the current histogram
-    public long[] GetHistogram()
+    public long[] GetHistogram()
-    {
+    {
-        long[] ret = new long[m_numBuckets];
+        long[] ret = new long[m_numBuckets];
-        lock (histoLock)
+        lock (histoLock)
-        {
+        {
-            int indx = m_lastBucket + 1;
+            int indx = m_lastBucket + 1;
-            for (int ii = 0; ii < m_numBuckets; ii++, indx++)
+            for (int ii = 0; ii < m_numBuckets; ii++, indx++)
-            {
+            {
-                if (indx >= m_numBuckets)
+                if (indx >= m_numBuckets)
-                    indx = 0;
+                    indx = 0;
-                ret[ii] = m_histogram[indx];
+                ret[ii] = m_histogram[indx];
-            }
+            }
-        }
+        }
-        return ret;
+        return ret;
-    }
+    }
-    public OSDMap GetHistogramAsOSDMap()
+    public OSDMap GetHistogramAsOSDMap()
-    {
+    {
-        OSDMap ret = new OSDMap();
+        OSDMap ret = new OSDMap();
-        ret.Add("Buckets", OSD.FromInteger(m_numBuckets));
+        ret.Add("Buckets", OSD.FromInteger(m_numBuckets));
-        ret.Add("BucketMilliseconds", OSD.FromInteger(m_bucketMilliseconds));
+        ret.Add("BucketMilliseconds", OSD.FromInteger(m_bucketMilliseconds));
-        ret.Add("TotalMilliseconds", OSD.FromInteger(m_totalHistogramMilliseconds));
+        ret.Add("TotalMilliseconds", OSD.FromInteger(m_totalHistogramMilliseconds));
-        // Compute a number for the first bucket in the histogram.
+        // Compute a number for the first bucket in the histogram.
-        // This will allow readers to know how this histogram relates to any previously read histogram.
+        // This will allow readers to know how this histogram relates to any previously read histogram.
-        int baseBucketNum = (m_timeBase / m_bucketMilliseconds) + m_lastBucket + 1;
+        int baseBucketNum = (m_timeBase / m_bucketMilliseconds) + m_lastBucket + 1;
-        ret.Add("BaseNumber", OSD.FromInteger(baseBucketNum));
+        ret.Add("BaseNumber", OSD.FromInteger(baseBucketNum));
-        ret.Add("Values", GetHistogramAsOSDArray());
+        ret.Add("Values", GetHistogramAsOSDArray());
-        return ret;
+        return ret;
-    }
+    }
-    // Get a copy of the current histogram
+    // Get a copy of the current histogram
-    public OSDArray GetHistogramAsOSDArray()
+    public OSDArray GetHistogramAsOSDArray()
-    {
+    {
-        OSDArray ret = new OSDArray(m_numBuckets);
+        OSDArray ret = new OSDArray(m_numBuckets);
-        lock (histoLock)
+        lock (histoLock)
-        {
+        {
-            int indx = m_lastBucket + 1;
+            int indx = m_lastBucket + 1;
-            for (int ii = 0; ii < m_numBuckets; ii++, indx++)
+            for (int ii = 0; ii < m_numBuckets; ii++, indx++)
-            {
+            {
-                if (indx >= m_numBuckets)
+                if (indx >= m_numBuckets)
-                    indx = 0;
+                    indx = 0;
-                ret[ii] = OSD.FromLong(m_histogram[indx]);
+                ret[ii] = OSD.FromLong(m_histogram[indx]);
-            }
+            }
-        }
+        }
-        return ret;
+        return ret;
-    }
+    }
-    // Zero out the histogram
+    // Zero out the histogram
-    public void Zero()
+    public void Zero()
-    {
+    {
-        lock (histoLock)
+        lock (histoLock)
-        {
+        {
-            for (int ii = 0; ii < m_numBuckets; ii++)
+            for (int ii = 0; ii < m_numBuckets; ii++)
-                m_histogram[ii] = 0;
+                m_histogram[ii] = 0;
-        }
+        }
-    }
+    }
-}
+}
-}
+}
diff --git a/OpenSim/Framework/Monitoring/Stats/Stat.cs b/OpenSim/Framework/Monitoring/Stats/Stat.cs
index a7cb2a6..2402acd 100644
--- a/OpenSim/Framework/Monitoring/Stats/Stat.cs
+++ b/OpenSim/Framework/Monitoring/Stats/Stat.cs
@@ -121,17 +121,17 @@ namespace OpenSim.Framework.Monitoring
            string container,
            StatType type,
            Action<Stat> pullAction,
-            StatVerbosity verbosity) 
+            StatVerbosity verbosity)
                : this(
-                    shortName, 
+                    shortName,
-                    name, 
+                    name,
-                    description, 
+                    description,
-                    unitName, 
+                    unitName,
-                    category, 
+                    category,
-                    container, 
+                    container,
-                    type, 
+                    type,
-                    MeasuresOfInterest.None, 
+                    MeasuresOfInterest.None,
-                    pullAction, 
+                    pullAction,
                    verbosity)
        {
        }
@@ -227,11 +227,11 @@ namespace OpenSim.Framework.Monitoring
        {
            StringBuilder sb = new StringBuilder();
            sb.AppendFormat(
-                "{0}.{1}.{2} : {3}{4}", 
+                "{0}.{1}.{2} : {3}{4}",
-                Category, 
+                Category,
-                Container, 
+                Container,
-                ShortName, 
+                ShortName,
-                Value, 
+                Value,
                string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
            AppendMeasuresOfInterest(sb);
@@ -239,6 +239,17 @@ namespace OpenSim.Framework.Monitoring
            return sb.ToString();
        }
+        public virtual OSDMap ToBriefOSDMap()
+        {
+            OSDMap ret = new OSDMap();
+            ret.Add("Value", OSD.FromReal(Value));
+            double lastChangeOverTime, averageChangeOverTime;
+            return ret;
+        }
        public virtual OSDMap ToOSDMap()
        {
            OSDMap ret = new OSDMap();
@@ -279,7 +290,7 @@ namespace OpenSim.Framework.Monitoring
                lock (m_samples)
                {
                    //                    m_log.DebugFormat(
-                    //                        "[STAT]: Samples for {0} are {1}", 
+                    //                        "[STAT]: Samples for {0} are {1}",
                    //                        Name, string.Join(",", m_samples.Select(s => s.ToString()).ToArray()));
                    foreach (double s in m_samples)
@@ -315,12 +326,12 @@ namespace OpenSim.Framework.Monitoring
            if (ComputeMeasuresOfInterest(out lastChangeOverTime, out averageChangeOverTime))
            {
                sb.AppendFormat(
-                    ", {0:0.##}{1}/s, {2:0.##}{3}/s", 
+                    ", {0:0.##}{1}/s, {2:0.##}{3}/s",
-                    lastChangeOverTime, 
+                    lastChangeOverTime,
-                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName), 
+                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName),
                    averageChangeOverTime,
                    string.IsNullOrEmpty(UnitName) ? "" : string.Format(" {0}", UnitName));
            }
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Monitoring/StatsLogger.cs b/OpenSim/Framework/Monitoring/StatsLogger.cs
index 15a37aa..b719af9 100644
--- a/OpenSim/Framework/Monitoring/StatsLogger.cs
+++ b/OpenSim/Framework/Monitoring/StatsLogger.cs
@@ -99,13 +99,13 @@ namespace OpenSim.Framework.Monitoring
            }
            string path = cmd[2];
-            
            using (StreamWriter sw = new StreamWriter(path, true))
            {
                foreach (string line in GetReport())
                    sw.WriteLine(line);
-            }   
+            }
-            
            MainConsole.Instance.OutputFormat("Stats saved to file {0}", path);
        }
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index 3136ee8..a6b341f 100644
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -47,6 +47,8 @@ namespace OpenSim.Framework.Monitoring
        // Subcommand used to list other stats.
        public const string ListSubCommand = "list";
+        public static string StatsPassword { get; set; }
        // All subcommands
        public static HashSet<string> SubCommands = new HashSet<string> { AllSubCommand, ListSubCommand };
@@ -80,8 +82,7 @@ namespace OpenSim.Framework.Monitoring
                    + "'all' will show all statistics.\n"
                    + "A <category> name will show statistics from that category.\n"
                    + "A <category>.<container> name will show statistics from that category in that container.\n"
-                    + "More than one name can be given separated by spaces.\n"
+                    + "More than one name can be given separated by spaces.\n",
-                    + "THIS STATS FACILITY IS EXPERIMENTAL AND DOES NOT YET CONTAIN ALL STATS",
                HandleShowStatsCommand);
            console.Commands.AddCommand(
@@ -91,7 +92,6 @@ namespace OpenSim.Framework.Monitoring
                "show stats [list|all|(<category>[.<container>])+",
                "Alias for 'stats show' command",
                HandleShowStatsCommand);
            StatsLogger.RegisterConsoleCommands(console);
        }
@@ -262,33 +262,36 @@ namespace OpenSim.Framework.Monitoring
        {
            OSDMap map = new OSDMap();
-            foreach (string catName in RegisteredStats.Keys)
+            lock (RegisteredStats)
            {
-                // Do this category if null spec, "all" subcommand or category name matches passed parameter.
+                foreach (string catName in RegisteredStats.Keys)
-                // Skip category if none of the above.
-                if (!(String.IsNullOrEmpty(pCategoryName) || pCategoryName == AllSubCommand || pCategoryName == catName))
-                    continue;
-                OSDMap contMap = new OSDMap();
-                foreach (string contName in RegisteredStats[catName].Keys)
                {
-                    if (!(string.IsNullOrEmpty(pContainerName) || pContainerName == AllSubCommand || pContainerName == contName))
+                    // Do this category if null spec, "all" subcommand or category name matches passed parameter.
+                    // Skip category if none of the above.
+                    if (!(String.IsNullOrEmpty(pCategoryName) || pCategoryName == AllSubCommand || pCategoryName == catName))
                        continue;
-                    
-                    OSDMap statMap = new OSDMap();
-                    SortedDictionary<string, Stat> theStats = RegisteredStats[catName][contName];
+                    OSDMap contMap = new OSDMap();
-                    foreach (string statName in theStats.Keys)
+                    foreach (string contName in RegisteredStats[catName].Keys)
                    {
-                        if (!(String.IsNullOrEmpty(pStatName) || pStatName == AllSubCommand || pStatName == statName))
+                        if (!(string.IsNullOrEmpty(pContainerName) || pContainerName == AllSubCommand || pContainerName == contName))
                            continue;
-                        statMap.Add(statName, theStats[statName].ToOSDMap());
+                        OSDMap statMap = new OSDMap();
-                    }
+                        SortedDictionary<string, Stat> theStats = RegisteredStats[catName][contName];
+                        foreach (string statName in theStats.Keys)
+                        {
+                            if (!(String.IsNullOrEmpty(pStatName) || pStatName == AllSubCommand || pStatName == statName))
+                                continue;
+                            statMap.Add(statName, theStats[statName].ToBriefOSDMap());
+                        }
-                    contMap.Add(contName, statMap);
+                        contMap.Add(contName, statMap);
+                    }
+                    map.Add(catName, contMap);
                }
-                map.Add(catName, contMap);
            }
            return map;
@@ -301,6 +304,17 @@ namespace OpenSim.Framework.Monitoring
            int response_code = 200;
            string contenttype = "text/json";
+            if (StatsPassword != String.Empty && (!request.ContainsKey("pass") || request["pass"].ToString() != StatsPassword))
+            {
+                responsedata["int_response_code"] = response_code;
+                responsedata["content_type"] = "text/plain";
+                responsedata["keepalive"] = false;
+                responsedata["str_response_string"] = "Access denied";
+                responsedata["access_control_allow_origin"] = "*";
+                return responsedata;
+            }
            string pCategoryName = StatsManager.AllSubCommand;
            string pContainerName = StatsManager.AllSubCommand;
            string pStatName = StatsManager.AllSubCommand;
@@ -358,8 +372,8 @@ namespace OpenSim.Framework.Monitoring
        /// <returns></returns>
        public static bool RegisterStat(Stat stat)
        {
-            SortedDictionary<string, SortedDictionary<string, Stat>> category = null, newCategory;
+            SortedDictionary<string, SortedDictionary<string, Stat>> category = null;
-            SortedDictionary<string, Stat> container = null, newContainer;
+            SortedDictionary<string, Stat> container = null;
            lock (RegisteredStats)
            {
@@ -369,22 +383,15 @@ namespace OpenSim.Framework.Monitoring
                if (TryGetStatParents(stat, out category, out container))
                    return false;
-                // We take a copy-on-write approach here of replacing dictionaries when keys are added or removed.
+                if (container == null)
-                // This means that we don't need to lock or copy them on iteration, which will be a much more
+                    container = new SortedDictionary<string, Stat>();
-                // common operation after startup.
-                if (container != null)
-                    newContainer = new SortedDictionary<string, Stat>(container);
-                else
-                    newContainer = new SortedDictionary<string, Stat>();
-                if (category != null)
+                if (category == null)
-                    newCategory = new SortedDictionary<string, SortedDictionary<string, Stat>>(category);
+                    category = new SortedDictionary<string, SortedDictionary<string, Stat>>();
-                else
-                    newCategory = new SortedDictionary<string, SortedDictionary<string, Stat>>();
-                newContainer[stat.ShortName] = stat;
+                container[stat.ShortName] = stat;
-                newCategory[stat.Container] = newContainer;
+                category[stat.Container] = container;
-                RegisteredStats[stat.Category] = newCategory;
+                RegisteredStats[stat.Category] = category;
            }
            return true;
@@ -397,23 +404,24 @@ namespace OpenSim.Framework.Monitoring
        /// <returns></returns>
        public static bool DeregisterStat(Stat stat)
        {
-            SortedDictionary<string, SortedDictionary<string, Stat>> category = null, newCategory;
+            SortedDictionary<string, SortedDictionary<string, Stat>> category = null;
-            SortedDictionary<string, Stat> container = null, newContainer;
+            SortedDictionary<string, Stat> container = null;
            lock (RegisteredStats)
            {
                if (!TryGetStatParents(stat, out category, out container))
                    return false;
-                newContainer = new SortedDictionary<string, Stat>(container);
+                if(container != null)
-                newContainer.Remove(stat.ShortName);
+                {
+                    container.Remove(stat.ShortName);
-                newCategory = new SortedDictionary<string, SortedDictionary<string, Stat>>(category);
+                    if(category != null && container.Count == 0)
-                newCategory.Remove(stat.Container);
+                    {
+                        category.Remove(stat.Container);
-                newCategory[stat.Container] = newContainer;
+                        if(category.Count == 0)
-                RegisteredStats[stat.Category] = newCategory;
+                            RegisteredStats.Remove(stat.Category);
+                    }
+                }
                return true;
            }
        }
@@ -554,4 +562,4 @@ namespace OpenSim.Framework.Monitoring
        Debug,
        Info
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Monitoring/Watchdog.cs b/OpenSim/Framework/Monitoring/Watchdog.cs
index a644fa5..9cac451 100644
--- a/OpenSim/Framework/Monitoring/Watchdog.cs
+++ b/OpenSim/Framework/Monitoring/Watchdog.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Monitoring
                FirstTick = Environment.TickCount & Int32.MaxValue;
                LastTick = FirstTick;
-                Stat 
+                Stat
                    = new Stat(
                        name,
                        string.Format("Last update of thread {0}", name),
@@ -180,6 +180,30 @@ namespace OpenSim.Framework.Monitoring
            m_watchdogTimer.Elapsed += WatchdogTimerElapsed;
        }
+        public static void Stop()
+        {
+            if(m_threads == null)
+                return;
+            lock(m_threads)
+            {
+                m_enabled = false;            
+                if(m_watchdogTimer != null)
+                {
+                    m_watchdogTimer.Dispose();
+                    m_watchdogTimer = null;
+                }
+                
+                foreach(ThreadWatchdogInfo twi in m_threads.Values)
+                {
+                    Thread t = twi.Thread;
+                    if(t.IsAlive)
+                        t.Abort();
+                }
+                m_threads.Clear();
+            }
+        }
        /// <summary>
        /// Add a thread to the watchdog tracker.
        /// </summary>
@@ -230,14 +254,12 @@ namespace OpenSim.Framework.Monitoring
                    twi.Cleanup();
                    m_threads.Remove(threadID);
                    return true;
                }
                else
                {
                    m_log.WarnFormat(
                        "[WATCHDOG]: Requested to remove thread with ID {0} but this is not being monitored", threadID);
                    return false;
                }
            }
@@ -317,6 +339,8 @@ namespace OpenSim.Framework.Monitoring
        /// <param name="e"></param>
        private static void WatchdogTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)
        {
+            if(!m_enabled)
+                return;
            int now = Environment.TickCount & Int32.MaxValue;
            int msElapsed = now - LastWatchdogThreadTick;
@@ -332,27 +356,36 @@ namespace OpenSim.Framework.Monitoring
            if (callback != null)
            {
                List<ThreadWatchdogInfo> callbackInfos = null;
+                List<ThreadWatchdogInfo> threadsToRemove = null;
+                const ThreadState thgone = ThreadState.Stopped;
                lock (m_threads)
                {
-                    foreach (ThreadWatchdogInfo threadInfo in m_threads.Values)
+                    foreach(ThreadWatchdogInfo threadInfo in m_threads.Values)
                    {
-                        if (threadInfo.Thread.ThreadState == ThreadState.Stopped)
+                        if(!m_enabled)
+                            return;
+                        if((threadInfo.Thread.ThreadState & thgone) != 0)
                        {
-                            RemoveThread(threadInfo.Thread.ManagedThreadId);
+                            if(threadsToRemove == null)
+                                threadsToRemove = new List<ThreadWatchdogInfo>();
-                            if (callbackInfos == null)
+                            threadsToRemove.Add(threadInfo);
+/*
+                            if(callbackInfos == null)
                                callbackInfos = new List<ThreadWatchdogInfo>();
                            callbackInfos.Add(threadInfo);
+*/
                        }
-                        else if (!threadInfo.IsTimedOut && now - threadInfo.LastTick >= threadInfo.Timeout)
+                        else if(!threadInfo.IsTimedOut && now - threadInfo.LastTick >= threadInfo.Timeout)
                        {
                            threadInfo.IsTimedOut = true;
-                            if (threadInfo.AlarmIfTimeout)
+                            if(threadInfo.AlarmIfTimeout)
                            {
-                                if (callbackInfos == null)
+                                if(callbackInfos == null)
                                    callbackInfos = new List<ThreadWatchdogInfo>();
                                // Send a copy of the watchdog info to prevent race conditions where the watchdog
@@ -361,9 +394,13 @@ namespace OpenSim.Framework.Monitoring
                            }
                        }
                    }
+                    if(threadsToRemove != null)
+                        foreach(ThreadWatchdogInfo twi in threadsToRemove)
+                            RemoveThread(twi.Thread.ManagedThreadId);
                }
-                if (callbackInfos != null)
+                if(callbackInfos != null)
                    foreach (ThreadWatchdogInfo callbackInfo in callbackInfos)
                        callback(callbackInfo);
            }
@@ -377,4 +414,4 @@ namespace OpenSim.Framework.Monitoring
            m_watchdogTimer.Start();
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Monitoring/WorkManager.cs b/OpenSim/Framework/Monitoring/WorkManager.cs
index d1a74ce..5d9b185 100644
--- a/OpenSim/Framework/Monitoring/WorkManager.cs
+++ b/OpenSim/Framework/Monitoring/WorkManager.cs
@@ -36,16 +36,16 @@ namespace OpenSim.Framework.Monitoring
    /// Manages various work items in the simulator.
    /// </summary>
    /// <remarks>
-    /// Currently, here work can be started 
+    /// Currently, here work can be started
    ///  * As a long-running and monitored thread.
    ///  * In a thread that will never timeout but where the job is expected to eventually complete.
    ///  * In a threadpool thread that will timeout if it takes a very long time to complete (> 10 mins).
    ///  * As a job which will be run in a single-threaded job engine.  Such jobs must not incorporate delays (sleeps,
    /// network waits, etc.).
-    /// 
+    ///
    /// This is an evolving approach to better manage the work that OpenSimulator is asked to do from a very diverse
    /// range of sources (client actions, incoming network, outgoing network calls, etc.).
-    /// 
+    ///
    /// Util.FireAndForget is still available to insert jobs in the threadpool, though this is equivalent to
    /// WorkManager.RunInThreadPool().
    /// </remarks>
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Monitoring
        static WorkManager()
        {
-            JobEngine = new JobEngine("Non-blocking non-critical job engine", "JOB ENGINE");
+            JobEngine = new JobEngine("Non-blocking non-critical job engine", "JOB ENGINE", 30000);
            StatsManager.RegisterStat(
                new Stat(
@@ -82,6 +82,12 @@ namespace OpenSim.Framework.Monitoring
                HandleControlCommand);
        }
+        public static void Stop()
+        {
+            JobEngine.Stop();
+            Watchdog.Stop();
+        }
        /// <summary>
        /// Start a new long-lived thread.
        /// </summary>
@@ -121,6 +127,7 @@ namespace OpenSim.Framework.Monitoring
            Thread thread = new Thread(start);
            thread.Priority = priority;
            thread.IsBackground = isBackground;
+            thread.Name = name;
            Watchdog.ThreadWatchdogInfo twi
                = new Watchdog.ThreadWatchdogInfo(thread, timeout, name)
@@ -129,7 +136,6 @@ namespace OpenSim.Framework.Monitoring
            Watchdog.AddThread(twi, name, log:log);
            thread.Start();
-            thread.Name = name;
            return thread;
        }
@@ -143,7 +149,7 @@ namespace OpenSim.Framework.Monitoring
        /// <param name="name">Name of the thread</param>
        public static void RunInThread(WaitCallback callback, object obj, string name, bool log = false)
        {
-            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)           
+            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)
            {
                Culture.SetCurrentCulture();
                callback(obj);
@@ -168,7 +174,7 @@ namespace OpenSim.Framework.Monitoring
        }
        /// <summary>
-        /// Run the callback via a threadpool thread. 
+        /// Run the callback via a threadpool thread.
        /// </summary>
        /// <remarks>
        /// Such jobs may run after some delay but must always complete.
@@ -176,9 +182,9 @@ namespace OpenSim.Framework.Monitoring
        /// <param name="callback"></param>
        /// <param name="obj"></param>
        /// <param name="name">The name of the job.  This is used in monitoring and debugging.</param>
-        public static void RunInThreadPool(System.Threading.WaitCallback callback, object obj, string name)
+        public static void RunInThreadPool(System.Threading.WaitCallback callback, object obj, string name, bool timeout = true)
        {
-            Util.FireAndForget(callback, obj, name);
+            Util.FireAndForget(callback, obj, name, timeout);
        }
        /// <summary>
@@ -187,17 +193,17 @@ namespace OpenSim.Framework.Monitoring
        /// <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 
+        /// 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 
+        /// 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 
+        /// 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.
@@ -211,10 +217,10 @@ namespace OpenSim.Framework.Monitoring
        /// <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 canRunInThisThread = false, bool mustNotTimeout = false,
            bool log = false)
        {
-            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)           
+            if (Util.FireAndForgetMethod == FireAndForgetMethod.RegressionTest)
            {
                Culture.SetCurrentCulture();
                callback(obj);
@@ -225,10 +231,8 @@ namespace OpenSim.Framework.Monitoring
                JobEngine.QueueJob(name, () => callback(obj));
            else if (canRunInThisThread)
                callback(obj);
-            else if (mustNotTimeout)
-                RunInThread(callback, obj, name, log);
            else
-                Util.FireAndForget(callback, obj, name);
+                Util.FireAndForget(callback, obj, name, !mustNotTimeout);
        }
        private static void HandleControlCommand(string module, string[] args)
@@ -272,16 +276,16 @@ namespace OpenSim.Framework.Monitoring
                    MainConsole.Instance.Output("Usage: debug jobengine log <level>");
                    return;
                }
-                
                //                int logLevel;
                int logLevel = int.Parse(args[3]);
                //                if (ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[4], out logLevel))
-                //                {                 
+                //                {
                JobEngine.LogLevel = logLevel;
                MainConsole.Instance.OutputFormat("Set debug log level to {0}", JobEngine.LogLevel);
                //                }
            }
-            else 
+            else
            {
                MainConsole.Instance.OutputFormat("Unrecognized job engine subcommand {0}", subCommand);
            }
diff --git a/OpenSim/Framework/MuteData.cs b/OpenSim/Framework/MuteData.cs
new file mode 100644
index 0000000..7c946d6
--- /dev/null
+++ b/OpenSim/Framework/MuteData.cs
@@ -0,0 +1,41 @@
+/*
+ * 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 OpenMetaverse;
+namespace OpenSim.Framework
+{
+    public class MuteData
+    {
+        public UUID AgentID;
+        public UUID MuteID;
+        public string MuteName;
+        public int MuteType;
+        public int MuteFlags;
+        public int Stamp;
+    }
+}
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 4b7d4c7..dfe9695 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -41,6 +41,7 @@ namespace OpenSim.Framework
        // "Out of band" managemnt https
        public bool ssl_listener = false;
+        public bool ssl_external = false;
        public uint https_port = 0;
        public string cert_path = String.Empty;
        public string cert_pass = String.Empty;
@@ -64,6 +65,7 @@ namespace OpenSim.Framework
            // "Out of band management https"
            ssl_listener = config.Configs["Network"].GetBoolean("https_listener",false);
+            ssl_external = config.Configs["Network"].GetBoolean("https_external",false);
            if( ssl_listener)
            {
                cert_path = config.Configs["Network"].GetString("cert_path",String.Empty);
diff --git a/OpenSim/Framework/NetworkUtil.cs b/OpenSim/Framework/NetworkUtil.cs
index 2e94b0d..93c9446 100644
--- a/OpenSim/Framework/NetworkUtil.cs
+++ b/OpenSim/Framework/NetworkUtil.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework
    /// Handles NAT translation in a 'manner of speaking'
    /// Allows you to return multiple different external
    /// hostnames depending on the requestors network
-    /// 
+    ///
    /// This enables standard port forwarding techniques
    /// to work correctly with OpenSim.
    /// </summary>
@@ -145,7 +145,7 @@ namespace OpenSim.Framework
                byte[] subnetBytes = subnet.Value.GetAddressBytes();
                byte[] localBytes = subnet.Key.GetAddressBytes();
                byte[] destBytes = destination.GetAddressBytes();
-                
                if (subnetBytes.Length != destBytes.Length || subnetBytes.Length != localBytes.Length)
                    return null;
diff --git a/OpenSim/Framework/OSChatMessage.cs b/OpenSim/Framework/OSChatMessage.cs
index 455756d..7450be2 100644
--- a/OpenSim/Framework/OSChatMessage.cs
+++ b/OpenSim/Framework/OSChatMessage.cs
@@ -51,12 +51,11 @@ namespace OpenSim.Framework
        protected object m_senderObject;
        protected ChatTypeEnum m_type;
        protected UUID m_fromID;
-        protected UUID m_toID;
+        protected UUID m_destination = UUID.Zero;
        public OSChatMessage()
        {
            m_position = new Vector3();
-            m_toID = UUID.Zero;
        }
        /// <summary>
@@ -104,15 +103,6 @@ namespace OpenSim.Framework
            set { m_from = value; }
        }
-        /// <summary>
-        /// The name of the sender (needed for scripts)
-        /// </summary>
-        public string To
-        {
-            get { return m_from; }
-            set { m_from = value; }
-        }
        #region IEventArgs Members
        /// TODO: Sender and SenderObject should just be Sender and of
@@ -142,13 +132,10 @@ namespace OpenSim.Framework
            set { m_fromID = value; }
        }
-        /// <summary>
+        public UUID Destination
-        /// The single recipient or all if not set.
-        /// </summary>
-        public UUID TargetUUID
        {
-            get { return m_toID; }
+            get { return m_destination; }
-            set { m_toID = value; }
+            set { m_destination = value; }
        }
        /// <summary>
diff --git a/OpenSim/Framework/ObjectChangeData.cs b/OpenSim/Framework/ObjectChangeData.cs
new file mode 100644
index 0000000..8d56291
--- /dev/null
+++ b/OpenSim/Framework/ObjectChangeData.cs
@@ -0,0 +1,80 @@
+/*
+ * 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 OpenMetaverse;
+namespace OpenSim.Framework
+{
+    public enum ObjectChangeType : uint
+    {
+        // bits definitions
+        Position = 0x01,
+        Rotation = 0x02,
+        Scale   = 0x04,
+        Group = 0x08,
+        UniformScale = 0x10,
+        // macros from above
+        // single prim
+        primP = 0x01,
+        primR = 0x02,
+        primPR = 0x03,
+        primS = 0x04,
+        primPS = 0x05,
+        primRS = 0x06,
+        primPSR = 0x07,
+        primUS = 0x14,
+        primPUS = 0x15,
+        primRUS = 0x16,
+        primPUSR = 0x17,
+        // group
+        groupP = 0x09,
+        groupR = 0x0A,
+        groupPR = 0x0B,
+        groupS = 0x0C,
+        groupPS = 0x0D,
+        groupRS = 0x0E,
+        groupPSR = 0x0F,
+        groupUS = 0x1C,
+        groupPUS = 0x1D,
+        groupRUS = 0x1E,
+        groupPUSR = 0x1F,
+        PRSmask = 0x07
+    }
+    public struct ObjectChangeData
+    {
+        public Quaternion rotation;
+        public Vector3 position;
+        public Vector3 scale;
+        public ObjectChangeType change;
+    }
+}
diff --git a/OpenSim/Framework/OutboundUrlFilter.cs b/OpenSim/Framework/OutboundUrlFilter.cs
index baa3647..63ae361 100644
--- a/OpenSim/Framework/OutboundUrlFilter.cs
+++ b/OpenSim/Framework/OutboundUrlFilter.cs
@@ -49,8 +49,8 @@ namespace OpenSim.Framework
        private List<IPEndPoint> m_blacklistExceptionEndPoints;
        public OutboundUrlFilter(
-            string name, 
+            string name,
-            List<IPNetwork> blacklistNetworks, List<IPEndPoint> blacklistEndPoints, 
+            List<IPNetwork> blacklistNetworks, List<IPEndPoint> blacklistEndPoints,
            List<IPNetwork> blacklistExceptionNetworks, List<IPEndPoint> blacklistExceptionEndPoints)
        {
            Name = name;
@@ -79,7 +79,7 @@ namespace OpenSim.Framework
            if (networkConfig != null)
            {
                configBlacklist = networkConfig.GetString("OutboundDisallowForUserScripts", configBlacklist);
-                configBlacklistExceptions 
+                configBlacklistExceptions
                    = networkConfig.GetString("OutboundDisallowForUserScriptsExcept", configBlacklistExceptions);
            }
@@ -98,7 +98,7 @@ namespace OpenSim.Framework
            string fullConfigEntry, string filterName, out List<IPNetwork> networks, out List<IPEndPoint> endPoints)
        {
            // Parse blacklist
-            string[] configBlacklistEntries 
+            string[] configBlacklistEntries
                = fullConfigEntry.Split(new char[] { '|' }, StringSplitOptions.RemoveEmptyEntries);
            configBlacklistEntries = configBlacklistEntries.Select(e => e.Trim()).ToArray();
@@ -129,7 +129,7 @@ namespace OpenSim.Framework
                    if (!Uri.TryCreate("http://" + configEntry, UriKind.Absolute, out configEntryUri))
                    {
                        m_log.ErrorFormat(
-                            "[OUTBOUND URL FILTER]: EndPoint entry [{0}] is invalid endpoint for {1}", 
+                            "[OUTBOUND URL FILTER]: EndPoint entry [{0}] is invalid endpoint for {1}",
                            configEntry, filterName);
                        continue;
@@ -184,14 +184,14 @@ namespace OpenSim.Framework
            foreach (IPEndPoint ep in endPoints)
            {
 //                m_log.DebugFormat(
-//                    "[OUTBOUND URL FILTER]: Checking [{0}:{1}] against endpoint [{2}]", 
+//                    "[OUTBOUND URL FILTER]: Checking [{0}:{1}] against endpoint [{2}]",
 //                    addr, port, ep);
                if (addr.Equals(ep.Address) && port == ep.Port)
                {
 //                    m_log.DebugFormat(
 //                        "[OUTBOUND URL FILTER]: Found [{0}:{1}] in endpoint [{2}]", addr, port, ep);
-                                        
                    return true;
                }
            }
@@ -212,7 +212,17 @@ namespace OpenSim.Framework
            // Check that we are permitted to make calls to this endpoint.
            bool foundIpv4Address = false;
-            IPAddress[] addresses = Dns.GetHostAddresses(url.Host);
+            IPAddress[] addresses = null;
+            
+            try
+            {
+                addresses = Dns.GetHostAddresses(url.Host);
+            }
+            catch
+            {
+                // If there is a DNS error, we can't stop the script!
+                return true;
+            }
            foreach (IPAddress addr in addresses)
            {
@@ -228,7 +238,7 @@ namespace OpenSim.Framework
 //                        m_log.DebugFormat("[OUTBOUND URL FILTER]: Found [{0}] in blacklist for {1}", url, Name);
                        // Check blacklist exceptions
-                        allowed 
+                        allowed
                            = OutboundUrlFilter.IsInNetwork(
                                addr, url.Port, m_blacklistExceptionNetworks, m_blacklistExceptionEndPoints, Name);
@@ -253,4 +263,4 @@ namespace OpenSim.Framework
            return allowed;
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Framework/ParcelMediaCommandEnum.cs b/OpenSim/Framework/ParcelMediaCommandEnum.cs
index 93c41ec..e714382 100644
--- a/OpenSim/Framework/ParcelMediaCommandEnum.cs
+++ b/OpenSim/Framework/ParcelMediaCommandEnum.cs
@@ -27,7 +27,7 @@
 namespace OpenSim.Framework
 {
-    public enum ParcelMediaCommandEnum
+    public enum ParcelMediaCommandEnum : int
    {
        Stop = 0,
        Pause = 1,
diff --git a/OpenSim/Framework/PermissionsUtil.cs b/OpenSim/Framework/PermissionsUtil.cs
index d785a78..e50d4df 100644
--- a/OpenSim/Framework/PermissionsUtil.cs
+++ b/OpenSim/Framework/PermissionsUtil.cs
@@ -60,28 +60,57 @@ namespace OpenSim.Framework
                str += "C";
            if ((perms & (int)PermissionMask.Transfer) != 0)
                str += "T";
+            if ((perms & (int)PermissionMask.Export) != 0)
+                str += "X";
            if (str == "")
                str = ".";
            return str;
        }
-        /// <summary>
+        public static void ApplyFoldedPermissions(uint foldedSourcePerms, ref uint targetPerms)
-        /// Applies an object's folded permissions to its regular permissions.
+        {
-        /// </summary>
+            uint folded = foldedSourcePerms & (uint)PermissionMask.FoldedMask;
-        /// <param name="foldedPerms">The folded permissions. Only the lowest 7 bits are examined.</param>
+            if(folded == 0 || folded == (uint)PermissionMask.FoldedMask) // invalid we need to ignore, or nothing to do
-        /// <param name="mainPerms">The permissions variable to modify.</param>
+                return; 
-        public static void ApplyFoldedPermissions(uint foldedPerms, ref uint mainPerms)
+            folded <<= (int)PermissionMask.FoldingShift;
+            folded |= ~(uint)PermissionMask.UnfoldedMask;
+            uint tmp = targetPerms;
+            tmp &= folded;
+            targetPerms = tmp;
+        }
+        // do not touch MOD
+        public static void ApplyNoModFoldedPermissions(uint foldedSourcePerms, ref uint target)
        {
-            if ((foldedPerms & 7) == 0)
+            uint folded = foldedSourcePerms & (uint)PermissionMask.FoldedMask;
-                return; // assume that if the folded permissions are 0 then this means that they weren't actually recorded
+            if(folded == 0 || folded == (uint)PermissionMask.FoldedMask) // invalid we need to ignore, or nothing to do
+                return; 
-            if ((foldedPerms & ((uint)PermissionMask.Copy >> 13)) == 0)
+            folded <<= (int)PermissionMask.FoldingShift;
-                mainPerms &= ~(uint)PermissionMask.Copy;
+            folded |= (~(uint)PermissionMask.UnfoldedMask | (uint)PermissionMask.Modify);
-            if ((foldedPerms & ((uint)PermissionMask.Transfer >> 13)) == 0)
-                mainPerms &= ~(uint)PermissionMask.Transfer;
+            uint tmp = target;
-            if ((foldedPerms & ((uint)PermissionMask.Modify >> 13)) == 0)
+            tmp &= folded;
-                mainPerms &= ~(uint)PermissionMask.Modify;
+            target = tmp;
        }
+        public static uint FixAndFoldPermissions(uint perms)
+        {
+            uint tmp = perms;
+            // C & T rule
+            if((tmp & (uint)(PermissionMask.Copy | PermissionMask.Transfer)) == 0)
+                tmp |= (uint)PermissionMask.Transfer;
+            // unlock
+            tmp |= (uint)PermissionMask.Move;
+            tmp &= ~(uint)PermissionMask.FoldedMask;
+            tmp |= ((tmp >> (int)PermissionMask.FoldingShift) & (uint)PermissionMask.FoldedMask);
+            return tmp;
+        }
    }
 }
diff --git a/OpenSim/Framework/PhysicsInertia.cs b/OpenSim/Framework/PhysicsInertia.cs
new file mode 100644
index 0000000..fa83de8
--- /dev/null
+++ b/OpenSim/Framework/PhysicsInertia.cs
@@ -0,0 +1,263 @@
+/*
+ * 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.Collections.Generic;
+using OpenMetaverse;
+using System.Text;
+using System.IO;
+using System.Xml;
+namespace OpenSim.Framework
+{
+    public class PhysicsInertiaData
+    {
+        public float TotalMass; // the total mass of a linkset
+        public Vector3 CenterOfMass;  // the center of mass position relative to root part position
+        public Vector3 Inertia; //  (Ixx, Iyy, Izz) moment of inertia relative to center of mass and principal axis in local coords
+        public Vector4 InertiaRotation; // if principal axis don't match local axis, the principal axis rotation
+                                        // or the upper triangle of the inertia tensor 
+                                        // Ixy (= Iyx), Ixz (= Izx), Iyz (= Izy))
+        public PhysicsInertiaData()
+        {
+        }
+        public PhysicsInertiaData(PhysicsInertiaData source)
+        {
+           TotalMass = source.TotalMass;
+           CenterOfMass = source.CenterOfMass;
+           Inertia = source.Inertia;
+           InertiaRotation = source.InertiaRotation;
+        }
+        private XmlTextWriter writer;
+        private void XWint(string name, int i)
+        {
+            writer.WriteElementString(name, i.ToString());
+        }
+        private void XWfloat(string name, float f)
+        {
+            writer.WriteElementString(name, f.ToString(Culture.FormatProvider));
+        }
+        private void XWVector(string name, Vector3 vec)
+        {
+            writer.WriteStartElement(name);
+            writer.WriteElementString("X", vec.X.ToString(Culture.FormatProvider));
+            writer.WriteElementString("Y", vec.Y.ToString(Culture.FormatProvider));
+            writer.WriteElementString("Z", vec.Z.ToString(Culture.FormatProvider));
+            writer.WriteEndElement();
+        }
+        private void XWVector4(string name, Vector4 quat)
+        {
+            writer.WriteStartElement(name);
+            writer.WriteElementString("X", quat.X.ToString(Culture.FormatProvider));
+            writer.WriteElementString("Y", quat.Y.ToString(Culture.FormatProvider));
+            writer.WriteElementString("Z", quat.Z.ToString(Culture.FormatProvider));
+            writer.WriteElementString("W", quat.W.ToString(Culture.FormatProvider));
+            writer.WriteEndElement();
+        }
+        public void ToXml2(XmlTextWriter twriter)
+        {
+            writer = twriter;
+            writer.WriteStartElement("PhysicsInertia");
+            XWfloat("MASS", TotalMass);
+            XWVector("CM", CenterOfMass);
+            XWVector("INERTIA", Inertia);
+            XWVector4("IROT", InertiaRotation);
+            writer.WriteEndElement();
+            writer = null;
+        }
+        XmlReader reader;
+        private int XRint()
+        {
+            return reader.ReadElementContentAsInt();
+        }
+        private float XRfloat()
+        {
+            return reader.ReadElementContentAsFloat();
+        }
+        public Vector3 XRvector()
+        {
+            Vector3 vec;
+            reader.ReadStartElement();
+            vec.X = reader.ReadElementContentAsFloat();
+            vec.Y = reader.ReadElementContentAsFloat();
+            vec.Z = reader.ReadElementContentAsFloat();
+            reader.ReadEndElement();
+            return vec;
+        }
+        public Vector4 XRVector4()
+        {
+            Vector4 q;
+            reader.ReadStartElement();
+            q.X = reader.ReadElementContentAsFloat();
+            q.Y = reader.ReadElementContentAsFloat();
+            q.Z = reader.ReadElementContentAsFloat();
+            q.W = reader.ReadElementContentAsFloat();
+            reader.ReadEndElement();
+            return q;
+        }
+        public static bool EReadProcessors(
+            Dictionary<string, Action> processors,
+            XmlReader xtr)
+        {
+            bool errors = false;
+            string nodeName = string.Empty;
+            while (xtr.NodeType != XmlNodeType.EndElement)
+            {
+                nodeName = xtr.Name;
+                Action p = null;
+                if (processors.TryGetValue(xtr.Name, out p))
+                {
+                    try
+                    {
+                        p();
+                    }
+                    catch
+                    {
+                        errors = true;
+                        if (xtr.NodeType == XmlNodeType.EndElement)
+                            xtr.Read();
+                    }
+                }
+                else
+                {
+                    xtr.ReadOuterXml(); // ignore
+                }
+            }
+            return errors;
+        }
+        public string ToXml2()
+        {
+            using (StringWriter sw = new StringWriter())
+            {
+                using (XmlTextWriter xwriter = new XmlTextWriter(sw))
+                {
+                    ToXml2(xwriter);
+                }
+                return sw.ToString();
+            }
+        }
+        public static PhysicsInertiaData FromXml2(string text)
+        {
+            if (text == String.Empty)
+                return null;
+            bool error;
+            PhysicsInertiaData v;
+            UTF8Encoding enc = new UTF8Encoding();
+            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);
+                }
+            if (error)
+                return null;
+            return v;
+        }
+        public static PhysicsInertiaData FromXml2(XmlReader reader)
+        {
+            PhysicsInertiaData data = new PhysicsInertiaData();
+            bool errors = false;
+            data.FromXml2(reader, out errors);
+            if (errors)
+                return null;
+            return data;
+        }
+        private void FromXml2(XmlReader _reader, out bool errors)
+        {
+            errors = false;
+            reader = _reader;
+            Dictionary<string, Action> m_XmlProcessors = new Dictionary<string, Action>();
+            m_XmlProcessors.Add("MASS", ProcessXR_Mass);
+            m_XmlProcessors.Add("CM", ProcessXR_CM);
+            m_XmlProcessors.Add("INERTIA", ProcessXR_Inertia);
+            m_XmlProcessors.Add("IROT", ProcessXR_InertiaRotation);
+            reader.ReadStartElement("PhysicsInertia", String.Empty);
+            errors = EReadProcessors(
+                m_XmlProcessors,
+                reader);
+            reader.ReadEndElement();
+            reader = null;
+        }
+        private void ProcessXR_Mass()
+        {
+            TotalMass = XRfloat();
+        }
+        private void ProcessXR_CM()
+        {
+            CenterOfMass = XRvector();
+        }
+        private void ProcessXR_Inertia()
+        {
+            Inertia = XRvector();
+        }
+        private void ProcessXR_InertiaRotation()
+        {
+            InertiaRotation = XRVector4();
+        }
+    }
+}
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index d12aa61..1e5e8bf 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -245,13 +245,22 @@ namespace OpenSim.Framework
            // occasionally seems to corrupt its addin cache
            // Hence, as a temporary solution we'll remove it before each startup
+            string customDir = Environment.GetEnvironmentVariable ("MONO_ADDINS_REGISTRY");
+            string v0 = "addin-db-000";
+            string v1 = "addin-db-001";
+            if (customDir != null && customDir != String.Empty)
+            {
+                v0 = Path.Combine(customDir, v0);
+                v1 = Path.Combine(customDir, v1);
+            }
            try
            {
-                if (Directory.Exists(dir + "/addin-db-000"))
+                if (Directory.Exists(v0))
-                    Directory.Delete(dir + "/addin-db-000", true);
+                    Directory.Delete(v0, true);
+                if (Directory.Exists(v1))
+                    Directory.Delete(v1, true);
-                if (Directory.Exists(dir + "/addin-db-001"))
-                    Directory.Delete(dir + "/addin-db-001", true);
            }
            catch (IOException)
            {
diff --git a/OpenSim/Framework/PluginManager.cs b/OpenSim/Framework/PluginManager.cs
index 0117096..0c94fcb 100644
--- a/OpenSim/Framework/PluginManager.cs
+++ b/OpenSim/Framework/PluginManager.cs
@@ -44,17 +44,17 @@ namespace OpenSim.Framework
    /// <summary>
    /// Manager for registries and plugins
    /// </summary>
-        public class PluginManager : SetupService
+    public class PluginManager : SetupService
-        {
+    {
-                public AddinRegistry PluginRegistry;
+        public AddinRegistry PluginRegistry;
-                public PluginManager(AddinRegistry registry): base (registry)
+        public PluginManager(AddinRegistry registry): base (registry)
        {
-                        PluginRegistry = registry;
+            PluginRegistry = registry;
-                }
+        }
-                /// <summary>
+        /// <summary>
        /// Installs the plugin.
        /// </summary>
        /// <returns>
@@ -97,14 +97,14 @@ namespace OpenSim.Framework
                Addin addin = PluginRegistry.GetAddin(aentry.Addin.Id);
                PluginRegistry.DisableAddin(addin.Id);
                addin.Enabled = false;
-                
                MainConsole.Instance.Output("Installation Success");
                ListInstalledAddins(out res);
                result = res;
                return true;
-            } 
+            }
            else
-            {                
+            {
                MainConsole.Instance.Output("Installation Failed");
                result = res;
                return false;
@@ -159,11 +159,11 @@ namespace OpenSim.Framework
        {
            Dictionary<string, object> res = new Dictionary<string, object>();
-                        Addin[] addins = GetSortedAddinList("RobustPlugin");
+            Addin[] addins = GetSortedAddinList("RobustPlugin");
-                        if(addins.Count() < 1)
+            if(addins.Count() < 1)
-                        {
+            {
-                                MainConsole.Instance.Output("Error!");
+                MainConsole.Instance.Output("Error!");
-                        }
+            }
            int count = 0;
            foreach (Addin addin in addins)
            {
@@ -377,7 +377,7 @@ namespace OpenSim.Framework
                r["enabled"] = rep.Enabled == true ? true : false;
                r["name"] = rep.Name;
                r["url"] = rep.Url;
-                
                res.Add(count.ToString(), r);
                count++;
            }
@@ -493,7 +493,7 @@ namespace OpenSim.Framework
        }
-                
        #region Util
        private void Testing()
        {
@@ -537,15 +537,15 @@ namespace OpenSim.Framework
            ArrayList xlist = new ArrayList();
            ArrayList list = new ArrayList();
-                        try 
+            try
-                        {
+            {
-                list.AddRange(PluginRegistry.GetAddins());
+                list.AddRange(PluginRegistry.GetAddins());
-                        }
+            }
-                        catch (Exception)
+            catch (Exception)
-                        {
+            {
-                                Addin[] x = xlist.ToArray(typeof(Addin)) as Addin[];
+                Addin[] x = xlist.ToArray(typeof(Addin)) as Addin[];
-                                return x;
+                return x;
-                        }
+            }
            foreach (Addin addin in list)
            {
@@ -559,5 +559,5 @@ namespace OpenSim.Framework
            return addins;
        }
        #endregion Util
-        }
+    }
 }
diff --git a/OpenSim/Framework/PrimeNumberHelper.cs b/OpenSim/Framework/PrimeNumberHelper.cs
index 477c274..5a1b3b2 100644
--- a/OpenSim/Framework/PrimeNumberHelper.cs
+++ b/OpenSim/Framework/PrimeNumberHelper.cs
@@ -35,7 +35,7 @@ namespace OpenSim.Framework
    public static class PrimeNumberHelper
    {
        /// <summary>
-        /// Precalculated prime numbers. 
+        /// Precalculated prime numbers.
        /// </summary>
        private static readonly int[] Primes = new int[]
                                                   {
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index c8a5376..6e7a038 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -238,8 +238,8 @@ namespace OpenSim.Framework
                SculptTexture = prim.Sculpt.SculptTexture;
                SculptType = (byte)prim.Sculpt.Type;
            }
-            else 
+            else
-            {  
+            {
                SculptType = (byte)OpenMetaverse.SculptType.None;
            }
        }
@@ -328,6 +328,72 @@ namespace OpenSim.Framework
            return shape;
        }
+        public static PrimitiveBaseShape CreateMesh(int numberOfFaces, UUID meshAssetID)
+        {
+            PrimitiveBaseShape shape = new PrimitiveBaseShape();
+            shape._pathScaleX = 100;
+            shape._pathScaleY = 100;
+            if(numberOfFaces <= 0) // oops ?
+                numberOfFaces = 1;
+            switch(numberOfFaces)
+            {
+                case 1: // torus 
+                    shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Curve1;
+                    shape._pathScaleY = 150;
+                    break;
+                case 2: // torus with hollow (a sl viewer whould see 4 faces on a hollow sphere)
+                    shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Curve1;
+                    shape.ProfileHollow = 27500;
+                    shape._pathScaleY = 150;
+                    break;
+                case 3: // cylinder
+                    shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Straight;
+                    break;
+                case 4: // cylinder with hollow
+                    shape.ProfileCurve = (byte)ProfileShape.Circle | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Straight;
+                    shape.ProfileHollow = 27500;
+                    break;
+                case 5: // prism
+                    shape.ProfileCurve = (byte)ProfileShape.EquilateralTriangle | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Straight;
+                    break;
+                case 6: // box
+                    shape.ProfileCurve = (byte)ProfileShape.Square  | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Straight;
+                    break;
+                case 7: // box with hollow
+                    shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Straight;
+                    shape.ProfileHollow = 27500;
+                    break;
+                default: // 8 faces  box with cut
+                    shape.ProfileCurve = (byte)ProfileShape.Square | (byte)HollowShape.Triangle;
+                    shape.PathCurve = (byte)Extrusion.Straight;
+                    shape.ProfileBegin = 9375;
+                    break;
+            }
+            shape.SculptEntry = true;
+            shape.SculptType = (byte)OpenMetaverse.SculptType.Mesh;
+            shape.SculptTexture = meshAssetID;
+            return shape;
+        }
        public void SetScale(float side)
        {
            _scale = new Vector3(side, side, side);
@@ -728,7 +794,12 @@ namespace OpenSim.Framework
                return _lightColorR;
            }
            set {
-                _lightColorR = value;
+                if (value < 0)
+                    _lightColorR = 0;
+                else if (value > 1.0f)
+                    _lightColorR = 1.0f;
+                else
+                    _lightColorR = value;
            }
        }
@@ -737,7 +808,12 @@ namespace OpenSim.Framework
                return _lightColorG;
            }
            set {
-                _lightColorG = value;
+                if (value < 0)
+                    _lightColorG = 0;
+                else if (value > 1.0f)
+                    _lightColorG = 1.0f;
+                else
+                    _lightColorG = value;
            }
        }
@@ -746,7 +822,12 @@ namespace OpenSim.Framework
                return _lightColorB;
            }
            set {
-                _lightColorB = value;
+                if (value < 0)
+                    _lightColorB = 0;
+                else if (value > 1.0f)
+                    _lightColorB = 1.0f;
+                else
+                    _lightColorB = value;
            }
        }
@@ -755,7 +836,12 @@ namespace OpenSim.Framework
                return _lightColorA;
            }
            set {
-                _lightColorA = value;
+                if (value < 0)
+                    _lightColorA = 0;
+                else if (value > 1.0f)
+                    _lightColorA = 1.0f;
+                else
+                    _lightColorA = value;
            }
        }
@@ -869,6 +955,11 @@ namespace OpenSim.Framework
        public ulong GetMeshKey(Vector3 size, float lod)
        {
+            return GetMeshKey(size, lod, false);
+        }
+        public ulong GetMeshKey(Vector3 size, float lod, bool convex)
+        {
            ulong hash = 5381;
            hash = djb2(hash, this.PathCurve);
@@ -914,6 +1005,9 @@ namespace OpenSim.Framework
                    hash = djb2(hash, scaleBytes[i]);
            }
+            if(convex)
+                hash = djb2(hash, 0xa5);
            return hash;
        }
@@ -1417,7 +1511,7 @@ namespace OpenSim.Framework
            prim.Textures = this.Textures;
            prim.Properties = new Primitive.ObjectProperties();
-            prim.Properties.Name = "Primitive";
+            prim.Properties.Name = "Object";
            prim.Properties.Description = "";
            prim.Properties.CreatorID = UUID.Zero;
            prim.Properties.GroupID = UUID.Zero;
@@ -1488,35 +1582,50 @@ namespace OpenSim.Framework
            {
                MediaList ml = new MediaList();
                ml.ReadXml(rawXml);
+                if(ml.Count == 0)
+                    return null;
                return ml;
            }
            public void ReadXml(string rawXml)
            {
-                using (StringReader sr = new StringReader(rawXml))
+                try
                {
-                    using (XmlTextReader xtr = new XmlTextReader(sr))
+                    using (StringReader sr = new StringReader(rawXml))
                    {
-                        xtr.MoveToContent();
+                        using (XmlTextReader xtr = new XmlTextReader(sr))
+                        {
+                            xtr.ProhibitDtd = true;
-                        string type = xtr.GetAttribute("type");
+                            xtr.MoveToContent();
-                        //m_log.DebugFormat("[MOAP]: Loaded media texture entry with type {0}", type);
-                        if (type != MEDIA_TEXTURE_TYPE)
+                            string type = xtr.GetAttribute("type");
-                            return;
+                            //m_log.DebugFormat("[MOAP]: Loaded media texture entry with type {0}", type);
-                        xtr.ReadStartElement("OSMedia");
+                            if (type != MEDIA_TEXTURE_TYPE)
+                                return;
-                        OSDArray osdMeArray = (OSDArray)OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml());
+                            xtr.ReadStartElement("OSMedia");
-                        foreach (OSD osdMe in osdMeArray)
+                            OSD osdp = OSDParser.DeserializeLLSDXml(xtr.ReadInnerXml());
-                        {
+                            if(osdp == null || !(osdp is OSDArray))
-                            MediaEntry me = (osdMe is OSDMap ? MediaEntry.FromOSD(osdMe) : new MediaEntry());
+                                return;
-                            Add(me);
-                        }
-                        xtr.ReadEndElement();
+                            OSDArray osdMeArray = osdp as OSDArray;
+                            if(osdMeArray.Count == 0)
+                                return;
+                            foreach (OSD osdMe in osdMeArray)
+                            {
+                                MediaEntry me = (osdMe is OSDMap ? MediaEntry.FromOSD(osdMe) : new MediaEntry());
+                                Add(me);
+                            }
+                        }
                    }
                }
+                catch
+                {
+                    m_log.Debug("PrimitiveBaseShape] error decoding MOAP xml" );
+                }
            }
            public void ReadXml(XmlReader reader)
diff --git a/OpenSim/Framework/PriorityQueue.cs b/OpenSim/Framework/PriorityQueue.cs
index e7a7f7f..22ffcdc 100644
--- a/OpenSim/Framework/PriorityQueue.cs
+++ b/OpenSim/Framework/PriorityQueue.cs
@@ -45,7 +45,8 @@ namespace OpenSim.Framework
        /// <summary>
        /// Total number of queues (priorities) available
        /// </summary>
-        public const uint NumberOfQueues = 12;
+        public const uint NumberOfQueues = 12; // includes immediate queues, m_queueCounts need to be set acording
        /// <summary>
        /// Number of queuest (priorities) that are processed immediately
@@ -56,11 +57,14 @@ namespace OpenSim.Framework
        private Dictionary<uint, LookupItem> m_lookupTable;
        // internal state used to ensure the deqeues are spread across the priority
-        // queues "fairly". queuecounts is the amount to pull from each queue in 
+        // queues "fairly". queuecounts is the amount to pull from each queue in
        // each pass. weighted towards the higher priority queues
        private uint m_nextQueue = 0;
        private uint m_countFromQueue = 0;
-        private uint[] m_queueCounts = { 8, 4, 4, 2, 2, 2, 2, 1, 1, 1, 1, 1 };
+        // first queues are imediate, so no counts
+//        private uint[] m_queueCounts = { 0, 0,          8,  4,  4, 2,  2,   2,  2,  1,  1, 1 };
+        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
@@ -101,7 +105,7 @@ namespace OpenSim.Framework
                int count = 0;
                for (int i = 0; i < m_heaps.Length; ++i)
                    count += m_heaps[i].Count;
-                
                return count;
            }
        }
@@ -109,7 +113,7 @@ namespace OpenSim.Framework
        /// <summary>
        /// Enqueue an item into the specified priority queue
        /// </summary>
-        public bool Enqueue(uint pqueue, IEntityUpdate value)
+        public bool Enqueue(uint pqueue, EntityUpdate value)
        {
            LookupItem lookup;
@@ -130,14 +134,29 @@ namespace OpenSim.Framework
            return true;
        }
+        public void Remove(List<uint> ids)
+        {
+            LookupItem lookup;
+            foreach (uint localid in ids)
+            {
+                if (m_lookupTable.TryGetValue(localid, out lookup))
+                {
+                    lookup.Heap.Remove(lookup.Handle);
+                    m_lookupTable.Remove(localid);
+                }
+            }
+        }
        /// <summary>
        /// Remove an item from one of the queues. Specifically, it removes the
        /// oldest item from the next queue in order to provide fair access to
        /// all of the queues
        /// </summary>
-        public bool TryDequeue(out IEntityUpdate value, out Int32 timeinqueue)
+        public bool TryDequeue(out EntityUpdate value, out Int32 timeinqueue)
        {
-            // If there is anything in priority queue 0, return it first no
+            // If there is anything in imediate queues, return it first no
            // matter what else. Breaks fairness. But very useful.
            for (int iq = 0; iq < NumberOfImmediateQueues; iq++)
            {
@@ -151,36 +170,35 @@ namespace OpenSim.Framework
                    return true;
                }
            }
-            
            // To get the fair queing, we cycle through each of the
-            // queues when finding an element to dequeue. 
+            // queues when finding an element to dequeue.
            // We pull (NumberOfQueues - QueueIndex) items from each queue in order
            // to give lower numbered queues a higher priority and higher percentage
-            // of the bandwidth. 
+            // of the bandwidth.
-            
            // Check for more items to be pulled from the current queue
            if (m_heaps[m_nextQueue].Count > 0 && m_countFromQueue > 0)
            {
                m_countFromQueue--;
-                
                MinHeapItem item = m_heaps[m_nextQueue].RemoveMin();
                m_lookupTable.Remove(item.Value.Entity.LocalId);
                timeinqueue = Util.EnvironmentTickCountSubtract(item.EntryTime);
                value = item.Value;
-                
                return true;
            }
-            
            // Find the next non-immediate queue with updates in it
-            for (int i = 0; i < NumberOfQueues; ++i)
+            for (uint i = NumberOfImmediateQueues; i < NumberOfQueues; ++i)
            {
-                m_nextQueue = (uint)((m_nextQueue + 1) % NumberOfQueues);
+                m_nextQueue++;
+                if(m_nextQueue >= NumberOfQueues)
+                    m_nextQueue = NumberOfImmediateQueues;
                m_countFromQueue = m_queueCounts[m_nextQueue];
-                // if this is one of the immediate queues, just skip it
-                if (m_nextQueue < NumberOfImmediateQueues)
-                    continue;
-                
                if (m_heaps[m_nextQueue].Count > 0)
                {
                    m_countFromQueue--;
@@ -189,19 +207,39 @@ namespace OpenSim.Framework
                    m_lookupTable.Remove(item.Value.Entity.LocalId);
                    timeinqueue = Util.EnvironmentTickCountSubtract(item.EntryTime);
                    value = item.Value;
+                    return true;
+                }
+            }
+            timeinqueue = 0;
+            value = default(EntityUpdate);
+            return false;
+        }
+        public bool TryOrderedDequeue(out EntityUpdate value, out Int32 timeinqueue)
+        {
+            // If there is anything in imediate queues, return it first no
+            // matter what else. Breaks fairness. But very useful.
+            for (int iq = 0; iq < NumberOfQueues; 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;
                }
            }
            timeinqueue = 0;
-            value = default(IEntityUpdate);
+            value = default(EntityUpdate);
            return false;
        }
        /// <summary>
        /// Reapply the prioritization function to each of the updates currently
-        /// stored in the priority queues. 
+        /// stored in the priority queues.
        /// </summary
        public void Reprioritize(UpdatePriorityHandler handler)
        {
@@ -253,8 +291,8 @@ namespace OpenSim.Framework
 #region MinHeapItem
        private struct MinHeapItem : IComparable<MinHeapItem>
        {
-            private IEntityUpdate value;
+            private EntityUpdate value;
-            internal IEntityUpdate Value {
+            internal EntityUpdate Value {
                get {
                    return this.value;
                }
@@ -290,7 +328,7 @@ namespace OpenSim.Framework
                this.pqueue = pqueue;
            }
-            internal MinHeapItem(uint pqueue, UInt64 entryorder, IEntityUpdate value)
+            internal MinHeapItem(uint pqueue, UInt64 entryorder, EntityUpdate value)
            {
                this.entrytime = Util.EnvironmentTickCount();
                this.entryorder = entryorder;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 79fbd96..75ed999 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -40,6 +40,7 @@ using OpenMetaverse.StructuredData;
 namespace OpenSim.Framework
 {
+    [Serializable]
    public class RegionLightShareData : ICloneable
    {
        public bool valid = false;
@@ -101,6 +102,11 @@ namespace OpenSim.Framework
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private static readonly string LogHeader = "[REGION INFO]";
+        public bool commFailTF = false;
+        public ConfigurationMember configMember;
+        public string DataStore = String.Empty;
        public string RegionFile = String.Empty;
        public bool isSandbox = false;
        public bool Persistent = true;
@@ -124,7 +130,7 @@ namespace OpenSim.Framework
        private float m_physPrimMin = 0;
        private int m_physPrimMax = 0;
        private bool m_clampPrimSize = false;
-        private int m_objectCapacity = 0;
+        private int m_objectCapacity = 15000;
        private int m_maxPrimsPerUser = -1;
        private int m_linksetCapacity = 0;
        private string m_regionType = String.Empty;
@@ -132,8 +138,6 @@ namespace OpenSim.Framework
        protected uint m_httpPort;
        protected string m_serverURI;
        protected string m_regionName = String.Empty;
-        protected bool Allow_Alternate_Ports;
-        public bool m_allow_alternate_ports;
        protected string m_externalHostName;
        protected IPEndPoint m_internalEndPoint;
        protected uint m_remotingPort;
@@ -141,6 +145,7 @@ namespace OpenSim.Framework
        public string RemotingAddress;
        public UUID ScopeID = UUID.Zero;
        private UUID m_maptileStaticUUID = UUID.Zero;
+        private bool m_resolveAddress = false;
        public uint WorldLocX = 0;
        public uint WorldLocY = 0;
@@ -170,6 +175,9 @@ namespace OpenSim.Framework
        /// </remarks>
        public uint RegionSizeZ = Constants.RegionHeight;
+        // If entering avatar has no specific coords, this is where they land
+        public Vector3 DefaultLandingPoint = new Vector3(128, 128, 30);
        private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>();
        // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
@@ -368,7 +376,7 @@ namespace OpenSim.Framework
        }
        public string MaptileStaticFile { get; private set; }
-        
        /// <summary>
        /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
        /// </summary>
@@ -381,17 +389,17 @@ namespace OpenSim.Framework
        /// <summary>
        /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
        /// </summary>
-        
        public string ServerURI
        {
-            get { 
+            get {
                if ( m_serverURI != string.Empty ) {
                    return m_serverURI;
                } else {
                    return "http://" + m_externalHostName + ":" + m_httpPort + "/";
                }
-            }            
+            }
-            set { 
+            set {
                if ( value.EndsWith("/") ) {
                    m_serverURI = value;
                } else {
@@ -412,6 +420,7 @@ namespace OpenSim.Framework
            set { m_remotingPort = value; }
        }
+        
        /// <value>
        /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw.
        ///
@@ -419,42 +428,7 @@ namespace OpenSim.Framework
        /// </value>
        public IPEndPoint ExternalEndPoint
        {
-            get
+            get { return Util.getEndPoint(m_externalHostName, m_internalEndPoint.Port); }
-            {
-                // Old one defaults to IPv6
-                //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port);
-                IPAddress ia = null;
-                // If it is already an IP, don't resolve it - just return directly
-                if (IPAddress.TryParse(m_externalHostName, out ia))
-                    return new IPEndPoint(ia, m_internalEndPoint.Port);
-                // Reset for next check
-                ia = null;
-                try
-                {
-                    foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName))
-                    {
-                        if (ia == null)
-                            ia = Adr;
-                        if (Adr.AddressFamily == AddressFamily.InterNetwork)
-                        {
-                            ia = Adr;
-                            break;
-                        }
-                    }
-                }
-                catch (SocketException e)
-                {
-                    throw new Exception(
-                        "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" +
-                        e + "' attached to this exception", e);
-                }
-                return new IPEndPoint(ia, m_internalEndPoint.Port);
-            }
            set { m_externalHostName = value.ToString(); }
        }
@@ -527,7 +501,7 @@ namespace OpenSim.Framework
            return null;
        }
-        private void SetExtraSetting(string key, string value)
+        public void SetExtraSetting(string key, string value)
        {
            string keylower = key.ToLower();
            m_extraSettings[keylower] = value;
@@ -535,7 +509,7 @@ namespace OpenSim.Framework
        private void ReadNiniConfig(IConfigSource source, string name)
        {
-//            bool creatingNew = false;
+            bool creatingNew = false;
            if (source.Configs.Count == 0)
            {
@@ -559,7 +533,7 @@ namespace OpenSim.Framework
                source.AddConfig(name);
-//                creatingNew = true;
+                creatingNew = true;
            }
            if (name == String.Empty)
@@ -663,18 +637,19 @@ namespace OpenSim.Framework
            }
            m_internalEndPoint = new IPEndPoint(address, port);
-            // AllowAlternatePorts
+            // ResolveAddress
            //
-            allKeys.Remove("AllowAlternatePorts");
+            allKeys.Remove("ResolveAddress");
-            if (config.Contains("AllowAlternatePorts"))
+            if (config.Contains("ResolveAddress"))
            {
-                m_allow_alternate_ports = config.GetBoolean("AllowAlternatePorts", true);
+                m_resolveAddress = config.GetBoolean("ResolveAddress", false);
            }
            else
            {
-                m_allow_alternate_ports = Convert.ToBoolean(MainConsole.Instance.CmdPrompt("Allow alternate ports", "False"));
+                if (creatingNew)
+                    m_resolveAddress = Convert.ToBoolean(MainConsole.Instance.CmdPrompt("Resolve hostname to IP on start (for running inside Docker)", "False"));
-                config.Set("AllowAlternatePorts", m_allow_alternate_ports.ToString());
+                config.Set("ResolveAddress", m_resolveAddress.ToString());
            }
            // ExternalHostName
@@ -697,15 +672,36 @@ namespace OpenSim.Framework
                    "[REGIONINFO]: Resolving SYSTEMIP to {0} for external hostname of region {1}",
                    m_externalHostName, name);
            }
-            else
+            else if (!m_resolveAddress)
            {
                m_externalHostName = externalName;
            }
+            else
+            {
+                IPAddress[] addrs = Dns.GetHostAddresses(externalName);
+                if (addrs.Length != 1) // If it is ambiguous or not resolveable, use it literally
+                    m_externalHostName = externalName;
+                else
+                    m_externalHostName = addrs[0].ToString();
+            }
            // RegionType
            m_regionType = config.GetString("RegionType", String.Empty);
            allKeys.Remove("RegionType");
+            // Get Default Landing Location (Defaults to 128,128)
+            string temp_location = config.GetString("DefaultLanding", "<128, 128, 30>");
+            Vector3 temp_vector;
+            if (Vector3.TryParse(temp_location, out temp_vector))
+                DefaultLandingPoint = temp_vector;
+            else
+                m_log.ErrorFormat("[RegionInfo]: Unable to parse DefaultLanding for '{0}'. The value given was '{1}'", RegionName, temp_location);
+            allKeys.Remove("DefaultLanding");
+            DoDefaultLandingSanityChecks();
            #region Prim and map stuff
            m_nonphysPrimMin = config.GetFloat("NonPhysicalPrimMin", 0);
@@ -719,11 +715,11 @@ namespace OpenSim.Framework
            m_physPrimMax = config.GetInt("PhysicalPrimMax", 0);
            allKeys.Remove("PhysicalPrimMax");
-            
            m_clampPrimSize = config.GetBoolean("ClampPrimSize", false);
            allKeys.Remove("ClampPrimSize");
-            
-            m_objectCapacity = config.GetInt("MaxPrims", 15000);
+            m_objectCapacity = config.GetInt("MaxPrims", m_objectCapacity);
            allKeys.Remove("MaxPrims");
            m_maxPrimsPerUser = config.GetInt("MaxPrimsPerUser", -1);
@@ -736,12 +732,12 @@ namespace OpenSim.Framework
            string mapTileStaticUUID = config.GetString("MaptileStaticUUID", UUID.Zero.ToString());
            if (UUID.TryParse(mapTileStaticUUID.Trim(), out m_maptileStaticUUID))
            {
-                config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString()); 
+                config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString());
            }
            MaptileStaticFile = config.GetString("MaptileStaticFile", String.Empty);
            allKeys.Remove("MaptileStaticFile");
-            
            #endregion
            AgentCapacity = config.GetInt("MaxAgents", 100);
@@ -758,6 +754,48 @@ namespace OpenSim.Framework
            }
        }
+        // Make sure DefaultLanding is within region borders with a buffer zone 5 meters from borders
+        private void DoDefaultLandingSanityChecks()
+        {
+            // Sanity Check Default Landing
+            float buffer_zone = 5f;
+            bool ValuesCapped = false;
+            // Minimum Positions
+            if (DefaultLandingPoint.X < buffer_zone)
+            {
+                DefaultLandingPoint.X = buffer_zone;
+                ValuesCapped = true;
+            }
+            if (DefaultLandingPoint.Y < buffer_zone)
+            {
+                DefaultLandingPoint.Y = buffer_zone;
+                ValuesCapped = true;
+            }
+            // Maximum Positions
+            if (DefaultLandingPoint.X > RegionSizeX - buffer_zone)
+            {
+                DefaultLandingPoint.X = RegionSizeX - buffer_zone;
+                ValuesCapped = true;
+            }
+            if (DefaultLandingPoint.Y > RegionSizeY - buffer_zone)
+            {
+                DefaultLandingPoint.Y = RegionSizeY - buffer_zone;
+                ValuesCapped = true;
+            }
+            // Height
+            if (DefaultLandingPoint.Z < 0f)
+                DefaultLandingPoint.Z = 0f;
+            if (ValuesCapped == true)
+                m_log.WarnFormat("[RegionInfo]: The default landing location for {0} has been capped to {1}", RegionName, DefaultLandingPoint);
+        }
        // Make sure user specified region sizes are sane.
        // Must be multiples of legacy region size (256).
        private void DoRegionSizeSanityChecks()
@@ -823,20 +861,20 @@ namespace OpenSim.Framework
            string location = String.Format("{0},{1}", RegionLocX, RegionLocY);
            config.Set("Location", location);
-            if (RegionSizeX > 0)
+            if (DataStore != String.Empty)
-                config.Set("SizeX", RegionSizeX);
+                config.Set("Datastore", DataStore);
-            if (RegionSizeY > 0)
+            if (RegionSizeX != Constants.RegionSize || RegionSizeY != Constants.RegionSize)
+            {
+                config.Set("SizeX", RegionSizeX);
                config.Set("SizeY", RegionSizeY);
+                //            if (RegionSizeZ > 0)
-//            if (RegionSizeZ > 0)
+                //                config.Set("SizeZ", RegionSizeZ);
-//                config.Set("SizeZ", RegionSizeZ);
+            }
            config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
            config.Set("InternalPort", m_internalEndPoint.Port);
-            config.Set("AllowAlternatePorts", m_allow_alternate_ports.ToString());
            config.Set("ExternalHostName", m_externalHostName);
            if (m_nonphysPrimMin > 0)
@@ -847,10 +885,10 @@ namespace OpenSim.Framework
            if (m_physPrimMin > 0)
                config.Set("PhysicalPrimMax", m_physPrimMin);
-            
            if (m_physPrimMax > 0)
                config.Set("PhysicalPrimMax", m_physPrimMax);
-                        
            config.Set("ClampPrimSize", m_clampPrimSize.ToString());
            if (m_objectCapacity > 0)
@@ -901,6 +939,222 @@ namespace OpenSim.Framework
                throw new Exception("Invalid file type for region persistence.");
        }
+        public void loadConfigurationOptionsFromMe()
+        {
+            configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_UUID_NULL_FREE,
+                                                "UUID of Region (Default is recommended, random UUID)",
+                                                RegionID.ToString(), true);
+            configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
+                                                "Region Name", RegionName, true);
+            configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Grid Location (X Axis)", RegionLocX.ToString(), true);
+            configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Grid Location (Y Axis)", RegionLocY.ToString(), true);
+            configMember.addConfigurationOption("sim_size_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Size of region in X dimension", RegionSizeX.ToString(), true);
+            configMember.addConfigurationOption("sim_size_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Size of region in Y dimension", RegionSizeY.ToString(), true);
+            configMember.addConfigurationOption("sim_size_z", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Size of region in Z dimension", RegionSizeZ.ToString(), true);
+            //m_configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
+            configMember.addConfigurationOption("internal_ip_address",
+                                                ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS,
+                                                "Internal IP Address for incoming UDP client connections",
+                                                m_internalEndPoint.Address.ToString(),
+                                                true);
+            configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+                                                "Internal IP Port for incoming UDP client connections",
+                                                m_internalEndPoint.Port.ToString(), true);
+            configMember.addConfigurationOption("external_host_name",
+                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
+                                                "External Host Name", m_externalHostName, true);
+            configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
+                                                "Last Map UUID", lastMapUUID.ToString(), true);
+            configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
+                                                "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true);
+            configMember.addConfigurationOption("nonphysical_prim_min", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
+                                                "Minimum size for nonphysical prims", m_nonphysPrimMin.ToString(), true);
+            configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+                                                "Maximum size for nonphysical prims", m_nonphysPrimMax.ToString(), true);
+            configMember.addConfigurationOption("physical_prim_min", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
+                                                "Minimum size for nonphysical prims", m_physPrimMin.ToString(), true);
+            configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+                                                "Maximum size for physical prims", m_physPrimMax.ToString(), true);
+            configMember.addConfigurationOption("clamp_prim_size", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
+                                                "Clamp prims to max size", m_clampPrimSize.ToString(), true);
+            configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+                                                "Max objects this sim will hold", m_objectCapacity.ToString(), true);
+            configMember.addConfigurationOption("linkset_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+                                                "Max prims an object will hold", m_linksetCapacity.ToString(), true);
+            configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+                                                "Max avatars this sim will hold",AgentCapacity.ToString(), true);
+            configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
+                                                "Scope ID for this region", ScopeID.ToString(), true);
+            configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                                "Free form string describing the type of region", String.Empty, true);
+            configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
+                                                "UUID of a texture to use as the map for this region", m_maptileStaticUUID.ToString(), true);
+        }
+        public void loadConfigurationOptions()
+        {
+            configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
+                                                "UUID of Region (Default is recommended, random UUID)",
+                                                UUID.Random().ToString(), true);
+            configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
+                                                "Region Name", "OpenSim Test", false);
+            configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Grid Location (X Axis)", "1000", false);
+            configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Grid Location (Y Axis)", "1000", false);
+            configMember.addConfigurationOption("sim_size_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Size of region in X dimension", Constants.RegionSize.ToString(), false);
+            configMember.addConfigurationOption("sim_size_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Size of region in Y dimension", Constants.RegionSize.ToString(), false);
+            configMember.addConfigurationOption("sim_size_z", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
+                                                "Size of region in Z dimension", Constants.RegionHeight.ToString(), false);
+            //m_configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
+            configMember.addConfigurationOption("internal_ip_address",
+                                                ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS,
+                                                "Internal IP Address for incoming UDP client connections", "0.0.0.0",
+                                                false);
+            configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+                                                "Internal IP Port for incoming UDP client connections",
+                                                ConfigSettings.DefaultRegionHttpPort.ToString(), false);
+            configMember.addConfigurationOption("external_host_name",
+                                                ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
+                                                "External Host Name", "127.0.0.1", false);
+            configMember.addConfigurationOption("lastmap_uuid", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
+                                    "Last Map UUID", lastMapUUID.ToString(), true);
+            configMember.addConfigurationOption("lastmap_refresh", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
+                                                "Last Map Refresh", Util.UnixTimeSinceEpoch().ToString(), true);
+            configMember.addConfigurationOption("nonphysical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+                                                "Maximum size for nonphysical prims", "0", true);
+            configMember.addConfigurationOption("physical_prim_max", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+                                                "Maximum size for physical prims", "0", true);
+            configMember.addConfigurationOption("clamp_prim_size", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
+                                                "Clamp prims to max size", "false", true);
+            configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+                                                "Max objects this sim will hold", "15000", true);
+            configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
+                                                "Max avatars this sim will hold", "100", true);
+            configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
+                                                "Scope ID for this region", UUID.Zero.ToString(), true);
+            configMember.addConfigurationOption("region_type", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
+                                                "Region Type", String.Empty, true);
+            configMember.addConfigurationOption("region_static_maptile", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
+                                                "UUID of a texture to use as the map for this region", String.Empty, true);
+        }
+        public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
+        {
+            switch (configuration_key)
+            {
+                case "sim_UUID":
+                    RegionID = (UUID) configuration_result;
+                    originRegionID = (UUID) configuration_result;
+                    break;
+                case "sim_name":
+                    RegionName = (string) configuration_result;
+                    break;
+                case "sim_location_x":
+                    RegionLocX = (uint) configuration_result;
+                    break;
+                case "sim_location_y":
+                    RegionLocY = (uint) configuration_result;
+                    break;
+                case "sim_size_x":
+                    RegionSizeX = (uint) configuration_result;
+                    break;
+                case "sim_size_y":
+                    RegionSizeY = (uint) configuration_result;
+                    break;
+                case "sim_size_z":
+                    RegionSizeZ = (uint) configuration_result;
+                    break;
+                case "datastore":
+                    DataStore = (string) configuration_result;
+                    break;
+                case "internal_ip_address":
+                    IPAddress address = (IPAddress) configuration_result;
+                    m_internalEndPoint = new IPEndPoint(address, 0);
+                    break;
+                case "internal_ip_port":
+                    m_internalEndPoint.Port = (int) configuration_result;
+                    break;
+                case "external_host_name":
+                    if ((string) configuration_result != "SYSTEMIP")
+                    {
+                        m_externalHostName = (string) configuration_result;
+                    }
+                    else
+                    {
+                        m_externalHostName = Util.GetLocalHost().ToString();
+                    }
+                    break;
+                case "lastmap_uuid":
+                    lastMapUUID = (UUID)configuration_result;
+                    break;
+                case "lastmap_refresh":
+                    lastMapRefresh = (string)configuration_result;
+                    break;
+                case "nonphysical_prim_max":
+                    m_nonphysPrimMax = (int)configuration_result;
+                    break;
+                case "physical_prim_max":
+                    m_physPrimMax = (int)configuration_result;
+                    break;
+                case "clamp_prim_size":
+                    m_clampPrimSize = (bool)configuration_result;
+                    break;
+                case "object_capacity":
+                    m_objectCapacity = (int)configuration_result;
+                    break;
+                case "linkset_capacity":
+                    m_linksetCapacity = (int)configuration_result;
+                    break;
+                case "agent_capacity":
+                    AgentCapacity = (int)configuration_result;
+                    break;
+                case "scope_id":
+                    ScopeID = (UUID)configuration_result;
+                    break;
+                case "region_type":
+                    m_regionType = (string)configuration_result;
+                    break;
+                case "region_static_maptile":
+                    m_maptileStaticUUID = (UUID)configuration_result;
+                    break;
+            }
+            return true;
+        }
        public void SaveLastMapUUID(UUID mapUUID)
        {
            lastMapUUID = mapUUID;
@@ -928,7 +1182,6 @@ namespace OpenSim.Framework
            if ((RemotingAddress != null) && !RemotingAddress.Equals(""))
                args["remoting_address"] = OSD.FromString(RemotingAddress);
            args["remoting_port"] = OSD.FromString(RemotingPort.ToString());
-            args["allow_alt_ports"] = OSD.FromBoolean(m_allow_alternate_ports);
            if ((proxyUrl != null) && !proxyUrl.Equals(""))
                args["proxy_url"] = OSD.FromString(proxyUrl);
            if (RegionType != String.Empty)
@@ -983,8 +1236,6 @@ namespace OpenSim.Framework
                RemotingAddress = args["remoting_address"].AsString();
            if (args["remoting_port"] != null)
                UInt32.TryParse(args["remoting_port"].AsString(), out m_remotingPort);
-            if (args["allow_alt_ports"] != null)
-                m_allow_alternate_ports = args["allow_alt_ports"].AsBoolean();
            if (args["proxy_url"] != null)
                proxyUrl = args["proxy_url"].AsString();
            if (args["region_type"] != null)
@@ -1004,5 +1255,29 @@ namespace OpenSim.Framework
            regionInfo.ServerURI = serverURI;
            return regionInfo;
        }
+        public int getInternalEndPointPort()
+        {
+            return m_internalEndPoint.Port;
+        }
+        public Dictionary<string, object> ToKeyValuePairs()
+        {
+            Dictionary<string, object> kvp = new Dictionary<string, object>();
+            kvp["uuid"] = RegionID.ToString();
+            kvp["locX"] = RegionLocX.ToString();
+            kvp["locY"] = RegionLocY.ToString();
+            kvp["external_ip_address"] = ExternalEndPoint.Address.ToString();
+            kvp["external_port"] = ExternalEndPoint.Port.ToString();
+            kvp["external_host_name"] = ExternalHostName;
+            kvp["http_port"] = HttpPort.ToString();
+            kvp["internal_ip_address"] = InternalEndPoint.Address.ToString();
+            kvp["internal_port"] = InternalEndPoint.Port.ToString();
+            // TODO: Remove in next major version
+            kvp["alternate_ports"] = "False";
+            kvp["server_uri"] = ServerURI;
+            return kvp;
+        }
    }
 }
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index a895c40..c2947a2 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Framework
            string[] parts = str.Split(',');
            if (parts.Length != 3)
                throw new ArgumentException("Invalid string: " + str);
-            
            SpawnPoint sp = new SpawnPoint();
            sp.Yaw = float.Parse(parts[0]);
            sp.Pitch = float.Parse(parts[1]);
@@ -105,7 +105,7 @@ namespace OpenSim.Framework
        public delegate void SaveDelegate(RegionSettings rs);
        public event SaveDelegate OnSave;
-        
        /// <value>
        /// These appear to be terrain textures that are shipped with the client.
        /// </value>
@@ -454,24 +454,24 @@ namespace OpenSim.Framework
            get { return m_LoadedCreationDateTime; }
            set { m_LoadedCreationDateTime = value; }
        }
-        
        public String LoadedCreationDate
        {
-            get 
+            get
-            { 
+            {
                TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime);
                DateTime stamp = new DateTime(1970, 1, 1) + ts;
-                return stamp.ToLongDateString(); 
+                return stamp.ToLongDateString();
            }
        }
        public String LoadedCreationTime
        {
-            get 
+            get
-            { 
+            {
                TimeSpan ts = new TimeSpan(0, 0, LoadedCreationDateTime);
                DateTime stamp = new DateTime(1970, 1, 1) + ts;
-                return stamp.ToLongTimeString(); 
+                return stamp.ToLongTimeString();
            }
        }
@@ -482,6 +482,28 @@ namespace OpenSim.Framework
            set { m_LoadedCreationID = value; }
        }
+        private bool m_GodBlockSearch = false;
+        public bool GodBlockSearch
+        {
+            get { return m_GodBlockSearch; }
+            set { m_GodBlockSearch = value; }
+        }
+        private bool m_Casino = false;
+        public bool Casino
+        {
+            get { return m_Casino; }
+            set { m_Casino = value; }
+        }
+        // Telehub support
+        private bool m_TelehubEnabled = false;
+        public bool HasTelehub
+        {
+            get { return m_TelehubEnabled; }
+            set { m_TelehubEnabled = value; }
+        }
        /// <summary>
        /// Connected Telehub object
        /// </summary>
@@ -520,4 +542,4 @@ namespace OpenSim.Framework
            l_SpawnPoints.Clear();
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Framework/RestClient.cs b/OpenSim/Framework/RestClient.cs
index 7080ca5..4939cf7 100644
--- a/OpenSim/Framework/RestClient.cs
+++ b/OpenSim/Framework/RestClient.cs
@@ -156,7 +156,7 @@ namespace OpenSim.Framework
        public void Dispose()
        {
            Dispose(true);
-            GC.SuppressFinalize(this); 
+            GC.SuppressFinalize(this);
        }
        protected virtual void Dispose(bool disposing)
@@ -388,10 +388,10 @@ namespace OpenSim.Framework
                            m_log.Error(string.Format("[REST CLIENT] Error fetching resource from server: {0} ", _request.Address.ToString()), e);
                        }
                    }
                    return null;
                }
                if (_asyncException != null)
                    throw _asyncException;
@@ -413,7 +413,7 @@ namespace OpenSim.Framework
            _request = (HttpWebRequest) WebRequest.Create(buildUri());
            _request.KeepAlive = false;
            _request.ContentType = "application/xml";
-            _request.Timeout = 900000;
+            _request.Timeout = 90000;
            _request.Method = RequestMethod;
            _asyncException = null;
            _request.ContentLength = src.Length;
@@ -428,18 +428,23 @@ namespace OpenSim.Framework
            if (WebUtil.DebugLevel >= 5)
                WebUtil.LogOutgoingDetail(string.Format("SEND {0}: ", reqnum), src);
-            Stream dst = _request.GetRequestStream();
+            
-            byte[] buf = new byte[1024];
-            int length = src.Read(buf, 0, 1024);
-            while (length > 0)
-            {
-                dst.Write(buf, 0, length);
-                length = src.Read(buf, 0, 1024);
-            }
            try
            {
+                using (Stream dst = _request.GetRequestStream())
+                {
+//                    m_log.Debug("[REST]: GetRequestStream is ok");
+                    byte[] buf = new byte[1024];
+                    int length = src.Read(buf, 0, 1024);
+//                    m_log.Debug("[REST]: First Read is ok");
+                    while (length > 0)
+                    {
+                        dst.Write(buf, 0, length);
+                        length = src.Read(buf, 0, 1024);
+                    }
+                }
                _response = (HttpWebResponse)_request.GetResponse();
            }
            catch (WebException e)
@@ -468,7 +473,8 @@ namespace OpenSim.Framework
                }
            }
-            _response.Close();
+            if (_response != null)
+                _response.Close();
 //            IAsyncResult responseAsyncResult = _request.BeginGetResponse(new AsyncCallback(ResponseIsReadyDelegate), _request);
@@ -673,4 +679,4 @@ namespace OpenSim.Framework
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Framework/SLUtil.cs b/OpenSim/Framework/SLUtil.cs
index e66d5be..9458625 100644
--- a/OpenSim/Framework/SLUtil.cs
+++ b/OpenSim/Framework/SLUtil.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Framework
            Material = -2
        }
-        
        #region SL / file extension / content-type conversions
        /// <summary>
@@ -175,10 +175,10 @@ namespace OpenSim.Framework
            new TypeMapping(AssetType.Folder, FolderType.CurrentOutfit, "application/vnd.ll.currentoutfitfolder", "currentoutfitfolder"),
            new TypeMapping(AssetType.Folder, FolderType.Outfit, "application/vnd.ll.outfitfolder", "outfitfolder"),
            new TypeMapping(AssetType.Folder, FolderType.MyOutfits, "application/vnd.ll.myoutfitsfolder", "myoutfitsfolder"),
-            
            // This next mappping is an asset to inventory item mapping.
            // Note: LL stores folders as assets of type Folder = 8, and it has a corresponding InventoryType = 8
-            // OpenSim doesn't store folders as assets, so this mapping should only be used when parsing things from the viewer to the server 
+            // OpenSim doesn't store folders as assets, so this mapping should only be used when parsing things from the viewer to the server
            new TypeMapping(AssetType.Folder, InventoryType.Folder, "application/vnd.ll.folder", "folder"),
            // OpenSim specific
@@ -198,7 +198,7 @@ namespace OpenSim.Framework
            inventory2Content = new Dictionary<sbyte, string>();
            content2Asset = new Dictionary<string, sbyte>();
            content2Inventory = new Dictionary<string, sbyte>();
-            
            foreach (TypeMapping mapping in MAPPINGS)
            {
                sbyte assetType = mapping.AssetTypeCode;
@@ -226,7 +226,7 @@ namespace OpenSim.Framework
                }
            }
        }
-        
        public static string SLAssetTypeToContentType(int assetType)
        {
            string contentType;
@@ -406,7 +406,7 @@ namespace OpenSim.Framework
                if(data[0] == "inv_item")
                {
                    skipInventoryItem(reader);
-                } 
+                }
                else if (line.IndexOf('{') >= 0)
                {
                    throw new NotANotecardFormatException(reader.LineNumber);
@@ -462,7 +462,7 @@ namespace OpenSim.Framework
                {
                    int length = Int32.Parse(data[2]);
                    notecardString = reader.getBlock(length);
-                } 
+                }
                else if (line.IndexOf('{') >= 0)
                {
                    throw new NotANotecardFormatException(reader.LineNumber);
diff --git a/OpenSim/Framework/Serialization/ArchiveConstants.cs b/OpenSim/Framework/Serialization/ArchiveConstants.cs
index ab3c285..9081411 100644
--- a/OpenSim/Framework/Serialization/ArchiveConstants.cs
+++ b/OpenSim/Framework/Serialization/ArchiveConstants.cs
@@ -72,12 +72,12 @@ namespace OpenSim.Framework.Serialization
        /// Path for region settings.
        /// </value>
        public const string SETTINGS_PATH = "settings/";
-        
        /// <value>
        /// Path for region settings.
        /// </value>
        public const string LANDDATA_PATH = "landdata/";
-        
        /// <value>
        /// Path for user profiles
        /// </value>
diff --git a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
index 55640ac..af130a5 100644
--- a/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
+++ b/OpenSim/Framework/Serialization/External/ExternalRepresentationUtils.cs
@@ -106,13 +106,13 @@ namespace OpenSim.Framework.Serialization.External
                    {
                        errors = true;
                        parseExceptionAction(nodeToFill, nodeName, e);
-                        
                        if (xtr.EOF)
                        {
                            m_log.Debug("[ExternalRepresentationUtils]: Aborting ExecuteReadProcessors due to unexpected end of XML");
                            break;
                        }
-                        
                        if (++numErrors == 10)
                        {
                            m_log.Debug("[ExternalRepresentationUtils]: Aborting ExecuteReadProcessors due to too many parsing errors");
@@ -156,6 +156,7 @@ namespace OpenSim.Framework.Serialization.External
                return xml;
            XmlDocument doc = new XmlDocument();
+            doc.XmlResolver=null;
            doc.LoadXml(xml);
            XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart");
@@ -220,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 }))
+            using (XmlReader reader = XmlReader.Create(wrappedReader, new XmlReaderSettings() { IgnoreWhitespace = true, ConformanceLevel = ConformanceLevel.Fragment, ProhibitDtd = true}))
            {
                TransformXml(reader, writer, sceneName, homeURL, userService, scopeID);
@@ -369,7 +370,7 @@ namespace OpenSim.Framework.Serialization.External
                        break;
                    case XmlNodeType.XmlDeclaration:
-                        // For various reasons, not all serializations have xml declarations (or consistent ones) 
+                        // For various reasons, not all serializations have xml declarations (or consistent ones)
                        // and as it's embedded inside a byte stream we don't need it anyway, so ignore.
                        break;
diff --git a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
index e42d56f..33ffd83 100644
--- a/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/LandDataSerializer.cs
@@ -178,6 +178,7 @@ 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/OspResolver.cs b/OpenSim/Framework/Serialization/External/OspResolver.cs
index fa7160f..a1e9d55 100644
--- a/OpenSim/Framework/Serialization/External/OspResolver.cs
+++ b/OpenSim/Framework/Serialization/External/OspResolver.cs
@@ -35,13 +35,13 @@ using OpenSim.Services.Interfaces;
 namespace OpenSim.Framework.Serialization
 {
    /// <summary>
-    /// Resolves OpenSim Profile Anchors (OSPA).  An OSPA is a string used to provide information for 
+    /// Resolves OpenSim Profile Anchors (OSPA).  An OSPA is a string used to provide information for
    /// identifying user profiles or supplying a simple name if no profile is available.
    /// </summary>
    public class OspResolver
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
        public const string OSPA_PREFIX = "ospa:";
        public const string OSPA_NAME_KEY = "n";
        public const string OSPA_NAME_VALUE_SEPARATOR = " ";
@@ -76,7 +76,7 @@ namespace OpenSim.Framework.Serialization
            return null;
        }
-        
        /// <summary>
        /// Make an OSPA given a user name
        /// </summary>
@@ -89,17 +89,17 @@ namespace OpenSim.Framework.Serialization
 //            m_log.DebugFormat("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName);
 //            System.Console.WriteLine("[OSP RESOLVER]: Made OSPA {0} for {1} {2}", ospa, firstName, lastName);
-            
            return ospa;
        }
-        
        /// <summary>
        /// Resolve an osp string into the most suitable internal OpenSim identifier.
        /// </summary>
-        /// 
+        ///
        /// In some cases this will be a UUID if a suitable profile exists on the system.  In other cases, this may
        /// just return the same identifier after creating a temporary profile.
-        /// 
+        ///
        /// <param name="ospa"></param>
        /// <param name="commsManager"></param>
        /// <returns>
@@ -111,14 +111,14 @@ namespace OpenSim.Framework.Serialization
            if (!ospa.StartsWith(OSPA_PREFIX))
            {
 //                m_log.DebugFormat("[OSP RESOLVER]: ResolveOspa() got unrecognized format [{0}]", ospa);
-                return UUID.Zero;            
+                return UUID.Zero;
            }
 //            m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa);
-            
            string ospaMeat = ospa.Substring(OSPA_PREFIX.Length);
            string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY);
-            
            foreach (string tuple in ospaTuples)
            {
                int tupleSeparatorIndex = tuple.IndexOf(OSPA_PAIR_SEPARATOR);
@@ -128,17 +128,17 @@ namespace OpenSim.Framework.Serialization
                    m_log.WarnFormat("[OSP RESOLVER]: Ignoring non-tuple component {0} in OSPA {1}", tuple, ospa);
                    continue;
                }
-                
                string key = tuple.Remove(tupleSeparatorIndex).Trim();
                string value = tuple.Substring(tupleSeparatorIndex + 1).Trim();
-                
                if (OSPA_NAME_KEY == key)
                    return ResolveOspaName(value, userService);
            }
-            
            return UUID.Zero;
        }
-        
        /// <summary>
        /// Hash a profile name into a UUID
        /// </summary>
@@ -148,7 +148,7 @@ namespace OpenSim.Framework.Serialization
        {
            return new UUID(Utils.MD5(Encoding.Unicode.GetBytes(name)), 0);
        }
-        
        /// <summary>
        /// Resolve an OSPI name by querying existing persistent user profiles.  If there is no persistent user profile
        /// then a temporary user profile is inserted in the cache.
@@ -164,13 +164,13 @@ namespace OpenSim.Framework.Serialization
                return UUID.Zero;
            int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR);
-            
            if (nameSeparatorIndex < 0)
            {
                m_log.WarnFormat("[OSP RESOLVER]: Ignoring unseparated name {0}", name);
                return UUID.Zero;
            }
-            
            string firstName = name.Remove(nameSeparatorIndex).TrimEnd();
            string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart();
@@ -178,14 +178,14 @@ namespace OpenSim.Framework.Serialization
            if (account != null)
            {
 //                m_log.DebugFormat(
-//                    "[OSP RESOLVER]: Found user account with uuid {0} for {1} {2}", 
+//                    "[OSP RESOLVER]: Found user account with uuid {0} for {1} {2}",
 //                    account.PrincipalID, firstName, lastName);
-                
                return account.PrincipalID;
            }
 //            else
 //            {
-//                m_log.DebugFormat("[OSP RESOLVER]: No resolved OSPA user account for {0}", name);            
+//                m_log.DebugFormat("[OSP RESOLVER]: No resolved OSPA user account for {0}", name);
 //            }
            // XXX: Disable temporary user profile creation for now as implementation is incomplete - justincc
@@ -194,11 +194,11 @@ namespace OpenSim.Framework.Serialization
            tempUserProfile.FirstName = firstName;
            tempUserProfile.SurName = lastName;
            tempUserProfile.ID = HashName(tempUserProfile.Name);
-            
            m_log.DebugFormat(
                "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID);
            commsManager.UserService.AddTemporaryUserProfile(tempUserProfile);
-            
            return tempUserProfile.ID;
            */
diff --git a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
index 19468c3..fd21f3e 100644
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Serialization.External
        {
            return Deserialize(Encoding.ASCII.GetString(serializedSettings, 0, serializedSettings.Length));
        }
-        
        /// <summary>
        /// Deserialize settings
        /// </summary>
@@ -60,14 +60,15 @@ namespace OpenSim.Framework.Serialization.External
        public static RegionSettings Deserialize(string serializedSettings)
        {
            RegionSettings settings = new RegionSettings();
-            
            StringReader sr = new StringReader(serializedSettings);
            XmlTextReader xtr = new XmlTextReader(sr);
-            
+            xtr.ProhibitDtd = true;
            xtr.ReadStartElement("RegionSettings");
-         
            xtr.ReadStartElement("General");
-           
            while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
            {
                switch (xtr.Name)
@@ -113,10 +114,10 @@ namespace OpenSim.Framework.Serialization.External
                        break;
                }
            }
-            
            xtr.ReadEndElement();
            xtr.ReadStartElement("GroundTextures");
-            
            while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
            {
                switch (xtr.Name)
@@ -159,10 +160,10 @@ namespace OpenSim.Framework.Serialization.External
                        break;
                }
            }
-           
            xtr.ReadEndElement();
            xtr.ReadStartElement("Terrain");
-            
            while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
            {
                switch (xtr.Name)
@@ -212,19 +213,19 @@ namespace OpenSim.Framework.Serialization.External
            xtr.Close();
            sr.Close();
-            
            return settings;
        }
-        
        public static string Serialize(RegionSettings settings)
        {
            StringWriter sw = new StringWriter();
            XmlTextWriter xtw = new XmlTextWriter(sw);
            xtw.Formatting = Formatting.Indented;
            xtw.WriteStartDocument();
-            
            xtw.WriteStartElement("RegionSettings");
-            
            xtw.WriteStartElement("General");
            xtw.WriteElementString("AllowDamage", settings.AllowDamage.ToString());
            xtw.WriteElementString("AllowLandResell", settings.AllowLandResell.ToString());
@@ -255,7 +256,7 @@ namespace OpenSim.Framework.Serialization.External
            xtw.WriteElementString("ElevationHighSE", settings.Elevation2SE.ToString());
            xtw.WriteElementString("ElevationHighNE", settings.Elevation2NE.ToString());
            xtw.WriteEndElement();
-            
            xtw.WriteStartElement("Terrain");
            xtw.WriteElementString("WaterHeight", settings.WaterHeight.ToString());
            xtw.WriteElementString("TerrainRaiseLimit", settings.TerrainRaiseLimit.ToString());
@@ -275,12 +276,12 @@ namespace OpenSim.Framework.Serialization.External
                    xtw.WriteElementString("SpawnPoint", sp.ToString());
            }
            xtw.WriteEndElement();
-            
            xtw.WriteEndElement();
-            
            xtw.Close();
            sw.Close();
-            
            return sw.ToString();
        }
    }
diff --git a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
index 994cede..12194ad 100644
--- a/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs
@@ -36,9 +36,9 @@ using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Services.Interfaces;
-    
 namespace OpenSim.Framework.Serialization.External
-{        
+{
    /// <summary>
    /// Serialize and deserialize user inventory items as an external format.
    /// </summary>
@@ -49,14 +49,14 @@ namespace OpenSim.Framework.Serialization.External
        private static Dictionary<string, Action<InventoryItemBase, XmlReader>> m_InventoryItemXmlProcessors
            = new Dictionary<string, Action<InventoryItemBase, XmlReader>>();
-        #region InventoryItemBase Processor initialization 
+        #region InventoryItemBase Processor initialization
        static UserInventoryItemSerializer()
        {
            m_InventoryItemXmlProcessors.Add("Name", ProcessName);
            m_InventoryItemXmlProcessors.Add("ID", ProcessID);
            m_InventoryItemXmlProcessors.Add("InvType", ProcessInvType);
            m_InventoryItemXmlProcessors.Add("CreatorUUID", ProcessCreatorUUID);
-            m_InventoryItemXmlProcessors.Add("CreatorID", ProcessCreatorID); 
+            m_InventoryItemXmlProcessors.Add("CreatorID", ProcessCreatorID);
            m_InventoryItemXmlProcessors.Add("CreatorData", ProcessCreatorData);
            m_InventoryItemXmlProcessors.Add("CreationDate", ProcessCreationDate);
            m_InventoryItemXmlProcessors.Add("Owner", ProcessOwner);
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Serialization.External
            m_InventoryItemXmlProcessors.Add("GroupID", ProcessGroupID);
            m_InventoryItemXmlProcessors.Add("GroupOwned", ProcessGroupOwned);
        }
-        #endregion 
+        #endregion
        #region InventoryItemBase Processors
        private static void ProcessName(InventoryItemBase item, XmlReader reader)
@@ -189,7 +189,7 @@ namespace OpenSim.Framework.Serialization.External
        {
            return Deserialize(Encoding.ASCII.GetString(serialization, 0, serialization.Length));
        }
-        
        /// <summary>
        /// Deserialize settings
        /// </summary>
@@ -202,6 +202,8 @@ namespace OpenSim.Framework.Serialization.External
            using (XmlTextReader reader = new XmlTextReader(new StringReader(serialization)))
            {
+                reader.ProhibitDtd = true;
                reader.ReadStartElement("InventoryItem");
                ExternalRepresentationUtils.ExecuteReadProcessors<InventoryItemBase>(
@@ -212,8 +214,8 @@ namespace OpenSim.Framework.Serialization.External
            //m_log.DebugFormat("[XXX]: parsed InventoryItemBase {0} - {1}", obj.Name, obj.UUID);
            return item;
-        }      
+        }
-        
        public static string Serialize(InventoryItemBase inventoryItem, Dictionary<string, object> options, IUserAccountService userAccountService)
        {
            StringWriter sw = new StringWriter();
@@ -294,11 +296,11 @@ namespace OpenSim.Framework.Serialization.External
            }
            writer.WriteEndElement();
-            
            writer.Close();
            sw.Close();
-            
            return sw.ToString();
-        }        
+        }
    }
 }
diff --git a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
index c685a15..34eaa99 100644
--- a/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/UserProfileSerializer.cs
@@ -42,31 +42,31 @@ namespace OpenSim.Framework.Serialization.External
    {
        public const int MAJOR_VERSION = 0;
        public const int MINOR_VERSION = 1;
-        
        public static string Serialize(UUID userID, string firstName, string lastName)
        {
            StringWriter sw = new StringWriter();
            XmlTextWriter xtw = new XmlTextWriter(sw);
            xtw.Formatting = Formatting.Indented;
            xtw.WriteStartDocument();
-            
            xtw.WriteStartElement("user_profile");
            xtw.WriteAttributeString("major_version", MAJOR_VERSION.ToString());
            xtw.WriteAttributeString("minor_version", MINOR_VERSION.ToString());
-                       
            xtw.WriteElementString("name", firstName + " " + lastName);
            xtw.WriteElementString("id", userID.ToString());
            xtw.WriteElementString("about", "");
-  
            // Not sure if we're storing this yet, need to take a look
 //            xtw.WriteElementString("Url", profile.Url);
            // or, indeed, interests
            xtw.WriteEndElement();
-            
            xtw.Close();
            sw.Close();
-            
            return sw.ToString();
        }
    }
diff --git a/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs b/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs
index acec20f..7dfb87b 100644
--- a/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Serialization/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Framework.Serialization")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
+// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from 
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
@@ -25,9 +25,9 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.3.*")]
+[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
diff --git a/OpenSim/Framework/Serialization/TarArchiveWriter.cs b/OpenSim/Framework/Serialization/TarArchiveWriter.cs
index 2a3bc48..a5c3d0a 100644
--- a/OpenSim/Framework/Serialization/TarArchiveWriter.cs
+++ b/OpenSim/Framework/Serialization/TarArchiveWriter.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.Serialization
            lock (m_bw)
            {
                m_bw.Write(finalZeroPadding);
-    
                m_bw.Flush();
                m_bw.Close();
            }
@@ -149,7 +149,7 @@ namespace OpenSim.Framework.Serialization
        {
 //            m_log.DebugFormat(
 //                "[TAR ARCHIVE WRITER]: Data for {0} is {1} bytes", filePath, (null == data ? "null" : data.Length.ToString()));
-                  
            byte[] header = new byte[512];
            // file path field (100)
@@ -208,18 +208,18 @@ namespace OpenSim.Framework.Serialization
            {
                // Write out header
                m_bw.Write(header);
-    
                // Write out data
                // An IOException occurs if we try to write out an empty array in Mono 2.6
                if (data.Length > 0)
                    m_bw.Write(data);
-    
                if (data.Length % 512 != 0)
                {
                    int paddingRequired = 512 - (data.Length % 512);
-    
                    //m_log.DebugFormat("[TAR ARCHIVE WRITER]: Padding data with {0} bytes", paddingRequired);
-    
                    byte[] padding = new byte[paddingRequired];
                    m_bw.Write(padding);
                }
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 5ce978e..81dd357 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -65,11 +65,12 @@ namespace OpenSim.Framework.Servers
        /// This will control a periodic log printout of the current 'show stats' (if they are active) for this
        /// server.
        /// </summary>
        private int m_periodDiagnosticTimerMS = 60 * 60 * 1000;
        private Timer m_periodicDiagnosticsTimer = new Timer(60 * 60 * 1000);
-        
        /// <summary>
-        /// Random uuid for private data 
+        /// Random uuid for private data
        /// </summary>
        protected string m_osSecret = String.Empty;
@@ -83,9 +84,8 @@ namespace OpenSim.Framework.Servers
        {
            // Random uuid for private data
            m_osSecret = UUID.Random().ToString();
        }
-        
        /// <summary>
        /// Must be overriden by child classes for their own server specific startup behaviour.
        /// </summary>
@@ -104,26 +104,33 @@ namespace OpenSim.Framework.Servers
                m_periodicDiagnosticsTimer.Interval = m_periodDiagnosticTimerMS;
                m_periodicDiagnosticsTimer.Enabled = true;
            }
-        }       
+        }
        protected override void ShutdownSpecific()
-        {            
+        {
-            m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
+            Watchdog.Enabled = false;
+            base.ShutdownSpecific();
+            
+            MainServer.Stop();
+            Thread.Sleep(5000);
+            Util.StopThreadPool();
+            WorkManager.Stop();
+            Thread.Sleep(1000);
            RemovePIDFile();
-            base.ShutdownSpecific();
+            m_log.Info("[SHUTDOWN]: Shutdown processing on main thread complete.  Exiting...");
-            if (!SuppressExit)
+           if (!SuppressExit)
-                System.Diagnostics.Process.GetCurrentProcess().Kill();
+                Environment.Exit(0);
-////                Environment.Exit(0);
        }
-        
        /// <summary>
        /// Provides a list of help topics that are available.  Overriding classes should append their topics to the
        /// information returned when the base method is called.
        /// </summary>
-        /// 
+        ///
        /// <returns>
        /// A list of strings that represent different help topics on which more information is available
        /// </returns>
@@ -147,20 +154,38 @@ namespace OpenSim.Framework.Servers
        /// Performs initialisation of the scene, such as loading configuration from disk.
        /// </summary>
        public virtual void Startup()
-        {            
+        {
-            StartupSpecific();
+            m_log.Info("[STARTUP]: Beginning startup processing");
-            
+            m_log.Info("[STARTUP]: version: " + m_version + Environment.NewLine);
+            // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and
+            // the clr version number doesn't match the project version number under Mono.
+            //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine);
+            m_log.InfoFormat(
+                "[STARTUP]: Operating system version: {0}, .NET platform {1}, {2}-bit\n",
+                Environment.OSVersion, Environment.OSVersion.Platform, Util.Is64BitProcess() ? "64" : "32");
+            try
+            {
+                StartupSpecific();
+            }
+            catch(Exception e)
+            {
+                m_log.Fatal("Fatal error: " + e.ToString());
+                Environment.Exit(1);
+            }
            TimeSpan timeTaken = DateTime.Now - m_startuptime;
-            
-            MainConsole.Instance.OutputFormat(
+//            MainConsole.Instance.OutputFormat(
-                "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.  Non-script portion of startup took {0}m {1}s.",
+//                "PLEASE WAIT FOR LOGINS TO BE ENABLED ON REGIONS ONCE SCRIPTS HAVE STARTED.  Non-script portion of startup took {0}m {1}s.",
-                timeTaken.Minutes, timeTaken.Seconds);
+//                timeTaken.Minutes, timeTaken.Seconds);
        }
-        public string osSecret 
+        public string osSecret
        {
            // Secret uuid for the simulator
-            get { return m_osSecret; }            
+            get { return m_osSecret; }
        }
        public string StatReport(IOSHttpRequest httpRequest)
@@ -169,8 +194,8 @@ namespace OpenSim.Framework.Servers
            if (httpRequest.Query.ContainsKey("callback"))
            {
                return httpRequest.Query["callback"].ToString() + "(" + StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version) + ");";
-            } 
+            }
-            else 
+            else
            {
                return StatsManager.SimExtraStats.XReport((DateTime.Now - m_startuptime).ToString() , m_version);
            }
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index f252bd5..f4ba02f 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        /// <summary>
        /// This is a pending websocket request before it got an sucessful upgrade response.
-        /// The consumer must call handler.HandshakeAndUpgrade() to signal to the handler to 
+        /// The consumer must call handler.HandshakeAndUpgrade() to signal to the handler to
        /// start the connection and optionally provide an origin authentication method.
        /// </summary>
        /// <param name="servicepath"></param>
@@ -104,7 +104,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            new Dictionary<string, PollServiceEventArgs>();
        protected Dictionary<string, WebSocketRequestDelegate> m_WebSocketHandlers =
-            new Dictionary<string, WebSocketRequestDelegate>(); 
+            new Dictionary<string, WebSocketRequestDelegate>();
        protected uint m_port;
        protected uint m_sslport;
@@ -253,7 +253,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                return new List<string>(m_rpcHandlers.Keys);
        }
-        // JsonRPC 
+        // JsonRPC
        public bool AddJsonRPCHandler(string method, JsonRPCMethod handler)
        {
            lock(jsonRpcHandlers)
@@ -399,10 +399,10 @@ namespace OpenSim.Framework.Servers.HttpServer
                        Stream requestStream = req.InputStream;
+                        string requestBody;
                        Encoding encoding = Encoding.UTF8;
-                        StreamReader reader = new StreamReader(requestStream, encoding);
+                        using(StreamReader reader = new StreamReader(requestStream, encoding))
+                            requestBody = reader.ReadToEnd();
-                        string requestBody = reader.ReadToEnd();
                        Hashtable keysvals = new Hashtable();
                        Hashtable headervals = new Hashtable();
@@ -458,10 +458,11 @@ namespace OpenSim.Framework.Servers.HttpServer
                dWebSocketRequestDelegate(req.Url.AbsolutePath, new WebSocketHttpServerHandler(req, context, 8192));
                return;
            }
-            
            OSHttpResponse resp = new OSHttpResponse(new HttpResponse(context, request),context);
            resp.ReuseContext = true;
-            HandleRequest(req, resp);           
+//            resp.ReuseContext = false;
+            HandleRequest(req, resp);
            // !!!HACK ALERT!!!
            // There seems to be a bug in the underlying http code that makes subsequent requests
@@ -552,7 +553,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                        LogIncomingToStreamHandler(request, requestHandler);
                    response.ContentType = requestHandler.ContentType; // Lets do this defaulting before in case handler has varying content type.
-                    
                    if (requestHandler is IStreamedRequestHandler)
                    {
                        IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler;
@@ -565,13 +566,10 @@ namespace OpenSim.Framework.Servers.HttpServer
                        IGenericHTTPHandler HTTPRequestHandler = requestHandler as IGenericHTTPHandler;
                        Stream requestStream = request.InputStream;
+                        string requestBody;
                        Encoding encoding = Encoding.UTF8;
-                        StreamReader reader = new StreamReader(requestStream, encoding);
+                        using(StreamReader reader = new StreamReader(requestStream, encoding))
+                            requestBody = reader.ReadToEnd();
-                        string requestBody = reader.ReadToEnd();
-                        reader.Close();
-                        //requestStream.Close();
                        Hashtable keysvals = new Hashtable();
                        Hashtable headervals = new Hashtable();
@@ -628,16 +626,16 @@ namespace OpenSim.Framework.Servers.HttpServer
                        case "text/html":
                            if (DebugLevel >= 3)
                                LogIncomingToContentTypeHandler(request);
-    
                            buffer = HandleHTTPRequest(request, response);
                            break;
-    
                        case "application/llsd+xml":
                        case "application/xml+llsd":
                        case "application/llsd+json":
                            if (DebugLevel >= 3)
                                LogIncomingToContentTypeHandler(request);
-    
                            buffer = HandleLLSDRequests(request, response);
                            break;
@@ -647,7 +645,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                            buffer = HandleJsonRpcRequests(request, response);
                            break;
-    
                        case "text/xml":
                        case "application/xml":
                        case "application/json":
@@ -664,7 +662,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                            {
                                if (DebugLevel >= 3)
                                    LogIncomingToContentTypeHandler(request);
-    
                                buffer = HandleLLSDRequests(request, response);
                            }
    //                        m_log.DebugFormat("[BASE HTTP SERVER]: Checking for HTTP Handler for request {0}", request.RawUrl);
@@ -672,23 +670,24 @@ namespace OpenSim.Framework.Servers.HttpServer
                            {
                                if (DebugLevel >= 3)
                                    LogIncomingToContentTypeHandler(request);
-    
                                buffer = HandleHTTPRequest(request, response);
                            }
                            else
                            {
                                if (DebugLevel >= 3)
                                    LogIncomingToXmlRpcHandler(request);
-    
                                // generic login request.
                                buffer = HandleXmlRpcRequests(request, response);
                            }
-    
                            break;
                    }
                }
-                request.InputStream.Close();
+                if(request.InputStream.CanRead)
+                    request.InputStream.Dispose();
                if (buffer != null)
                {
@@ -759,7 +758,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                // Every month or so this will wrap and give bad numbers, not really a problem
                // since its just for reporting
                int tickdiff = requestEndTick - requestStartTick;
-                if (tickdiff > 3000 && requestHandler != null && requestHandler.Name != "GetTexture")
+                if (tickdiff > 3000 && (requestHandler == null || requestHandler.Name == null || requestHandler.Name != "GetTexture"))
                {
                    m_log.InfoFormat(
                        "[LOGHTTP] Slow handling of {0} {1} {2} {3} {4} from {5} took {6}ms",
@@ -970,7 +969,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 //        private bool TryGetAgentHandler(OSHttpRequest request, OSHttpResponse response, out IHttpAgentHandler agentHandler)
 //        {
 //            agentHandler = null;
-//            
+//
 //            lock (m_agentHandlers)
 //            {
 //                foreach (IHttpAgentHandler handler in m_agentHandlers.Values)
@@ -996,7 +995,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        {
            String requestBody;
-            Stream requestStream = request.InputStream;
+            Stream requestStream = Util.Copy(request.InputStream);
            Stream innerStream = null;
            try
            {
@@ -1007,9 +1006,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                }
                using (StreamReader reader = new StreamReader(requestStream, Encoding.UTF8))
-                {
                    requestBody = reader.ReadToEnd();
-                }
            }
            finally
            {
@@ -1024,6 +1022,19 @@ namespace OpenSim.Framework.Servers.HttpServer
            string responseString = String.Empty;
            XmlRpcRequest xmlRprcRequest = null;
+            bool gridproxy = false;
+            if (requestBody.Contains("encoding=\"utf-8"))
+            {
+                int channelindx = -1;
+                int optionsindx = requestBody.IndexOf(">options<");
+                if(optionsindx >0)
+                {
+                    channelindx = requestBody.IndexOf(">channel<");
+                    if (optionsindx < channelindx)
+                        gridproxy = true;
+                }
+            }
            try
            {
                xmlRprcRequest = (XmlRpcRequest) (new XmlRpcRequestDeserializer()).Deserialize(requestBody);
@@ -1081,6 +1092,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                        }
                        xmlRprcRequest.Params.Add(request.Headers.Get(xff)); // Param[3]
+                        if (gridproxy)
+                            xmlRprcRequest.Params.Add("gridproxy");  // Param[4]
                        try
                        {
                            xmlRpcResponse = method(xmlRprcRequest, request.RemoteIPEndPoint);
@@ -1154,7 +1167,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            return buffer;
        }
-        // JsonRpc (v2.0 only) 
+        // JsonRpc (v2.0 only)
        // Batch requests not yet supported
        private byte[] HandleJsonRpcRequests(OSHttpRequest request, OSHttpResponse response)
        {
@@ -1171,7 +1184,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                jsonRpcResponse.Error.Code = ErrorCode.InternalError;
                jsonRpcResponse.Error.Message = e.Message;
            }
-            
            requestStream.Close();
            if (jsonRpcRequest != null)
@@ -1236,7 +1249,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            string responseData = string.Empty;
            responseData = jsonRpcResponse.Serialize();
-       
            byte[] buffer = Encoding.UTF8.GetBytes(responseData);
            return buffer;
        }
@@ -1246,12 +1259,10 @@ namespace OpenSim.Framework.Servers.HttpServer
            //m_log.Warn("[BASE HTTP SERVER]: We've figured out it's a LLSD Request");
            Stream requestStream = request.InputStream;
+            string requestBody;
            Encoding encoding = Encoding.UTF8;
-            StreamReader reader = new StreamReader(requestStream, encoding);
+            using(StreamReader reader = new StreamReader(requestStream, encoding))
+                requestBody= reader.ReadToEnd();
-            string requestBody = reader.ReadToEnd();
-            reader.Close();
-            requestStream.Close();
            //m_log.DebugFormat("[OGP]: {0}:{1}", request.RawUrl, requestBody);
            response.KeepAlive = true;
@@ -1516,7 +1527,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                        }
                    }
                }
-    
                if (String.IsNullOrEmpty(bestMatch))
                {
                    llsdHandler = null;
@@ -1575,15 +1586,10 @@ namespace OpenSim.Framework.Servers.HttpServer
            byte[] buffer;
            Stream requestStream = request.InputStream;
+            string requestBody;
            Encoding encoding = Encoding.UTF8;
-            StreamReader reader = new StreamReader(requestStream, encoding);
+            using(StreamReader reader = new StreamReader(requestStream, encoding))
+                requestBody = reader.ReadToEnd();
-            string requestBody = reader.ReadToEnd();
-            // avoid warning for now
-            reader.ReadToEnd();
-            reader.Close();
-            requestStream.Close();
            Hashtable keysvals = new Hashtable();
            Hashtable headervals = new Hashtable();
@@ -1732,10 +1738,40 @@ namespace OpenSim.Framework.Servers.HttpServer
        internal byte[] DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response)
        {
-            //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response");
+            int responsecode;
-            int responsecode = (int)responsedata["int_response_code"];
+            string responseString = String.Empty;
-            string responseString = (string)responsedata["str_response_string"];
+            byte[] responseData = null;
-            string contentType = (string)responsedata["content_type"];
+            string contentType;
+            if (responsedata == null)
+            {
+                responsecode = 500;
+                responseString = "No response could be obtained";
+                contentType = "text/plain";
+                responsedata = new Hashtable();
+            }
+            else
+            {
+                try
+                {
+                    //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response");
+                    responsecode = (int)responsedata["int_response_code"];
+                    if (responsedata["bin_response_data"] != null)
+                        responseData = (byte[])responsedata["bin_response_data"];
+                    else
+                        responseString = (string)responsedata["str_response_string"];
+                    contentType = (string)responsedata["content_type"];
+                    if (responseString == null)
+                        responseString = String.Empty;
+                }
+                catch
+                {
+                    responsecode = 500;
+                    responseString = "No response could be obtained";
+                    contentType = "text/plain";
+                    responsedata = new Hashtable();
+                }
+            }
            if (responsedata.ContainsKey("error_status_text"))
            {
@@ -1745,16 +1781,19 @@ 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"))
@@ -1768,8 +1807,11 @@ 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)
@@ -1780,25 +1822,40 @@ namespace OpenSim.Framework.Servers.HttpServer
            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());
+            }
            byte[] buffer;
-            if (!(contentType.Contains("image")
+            if (responseData != null)
-                || contentType.Contains("x-shockwave-flash")
-                || contentType.Contains("application/x-oar")
-                || contentType.Contains("application/vnd.ll.mesh")))
            {
-                // Text
+                buffer = responseData;
-                buffer = Encoding.UTF8.GetBytes(responseString);
            }
            else
            {
-                // Binary!
+                if (!(contentType.Contains("image")
-                buffer = Convert.FromBase64String(responseString);
+                    || 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.SendChunked = false;
+                response.SendChunked = false;
-            response.ContentLength64 = buffer.Length;
+                response.ContentLength64 = buffer.Length;
-            response.ContentEncoding = Encoding.UTF8;
+                response.ContentEncoding = Encoding.UTF8;
+            }
            return buffer;
        }
@@ -1831,8 +1888,8 @@ namespace OpenSim.Framework.Servers.HttpServer
            response.SendChunked = false;
            response.ContentLength64 = buffer.Length;
            response.ContentEncoding = Encoding.UTF8;
-            
-                
            return buffer;
        }
@@ -1886,7 +1943,8 @@ namespace OpenSim.Framework.Servers.HttpServer
                m_httpListener2.Start(64);
                // Long Poll Service Manager with 3 worker threads a 25 second timeout for no events
-                PollServiceRequestManager = new PollServiceRequestManager(this, performPollResponsesAsync, 3, 25000);
+                PollServiceRequestManager = new PollServiceRequestManager(this, performPollResponsesAsync, 2, 25000);
                PollServiceRequestManager.Start();
                HTTPDRunning = true;
@@ -1908,7 +1966,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                throw e;
            }
-            m_requestsProcessedStat 
+            m_requestsProcessedStat
                = new Stat(
                    "HTTPRequestsServed",
                    "Number of inbound HTTP requests processed",
@@ -1920,7 +1978,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    MeasuresOfInterest.AverageChangeOverTime,
                    stat => stat.Value = RequestNumber,
                    StatVerbosity.Debug);
-          
            StatsManager.RegisterStat(m_requestsProcessedStat);
        }
@@ -1937,7 +1995,9 @@ namespace OpenSim.Framework.Servers.HttpServer
        public void httpServerException(object source, Exception exception)
        {
-            m_log.Error(String.Format("[BASE HTTP SERVER]: {0} had an exception: {1} ", source.ToString(), exception.Message), exception);
+            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)
            {
@@ -1957,7 +2017,8 @@ namespace OpenSim.Framework.Servers.HttpServer
            try
            {
-                PollServiceRequestManager.Stop();
+                if(PollServiceRequestManager != null)
+                    PollServiceRequestManager.Stop();
                m_httpListener2.ExceptionThrown -= httpServerException;
                //m_httpListener2.DisconnectHandler = null;
@@ -1984,6 +2045,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        public void RemoveHTTPHandler(string httpMethod, string path)
        {
+            if (path == null) return; // Caps module isn't loaded, tries to remove handler where path = null
            lock (m_HTTPHandlers)
            {
                if (httpMethod != null && httpMethod.Length == 0)
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
index d4a1ec3..01d95e9 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseRequestHandler.cs
@@ -69,13 +69,13 @@ namespace OpenSim.Framework.Servers.HttpServer
            {
                StatsManager.RegisterStat(
                    new Stat(
-                    "requests", 
+                    "requests",
-                    "requests", 
+                    "requests",
-                    "Number of requests received by this service endpoint", 
+                    "Number of requests received by this service endpoint",
-                    "requests", 
+                    "requests",
-                    "service", 
+                    "service",
-                    string.Format("{0}:{1}", httpMethod, path), 
+                    string.Format("{0}:{1}", httpMethod, path),
-                    StatType.Pull, 
+                    StatType.Pull,
                    MeasuresOfInterest.AverageChangeOverTime,
                    s => s.Value = RequestsReceived,
                    StatVerbosity.Debug));
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
index 41aa19b..7fc9f0b 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandler.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            : base(httpMethod, path, name, description) {}
        protected BaseStreamHandler(string httpMethod, string path, IServiceAuth auth)
-            : base(httpMethod, path, null, null) 
+            : base(httpMethod, path, null, null)
        {
            m_Auth = auth;
        }
@@ -62,7 +62,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                HttpStatusCode statusCode;
                if (!m_Auth.Authenticate(httpRequest.Headers, httpResponse.AddHeader, out statusCode))
-                {                
+                {
                    httpResponse.StatusCode = (int)statusCode;
                    httpResponse.ContentType = "text/plain";
                    return new byte[0];
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
index 1b88545..9619e03 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseStreamHandlerBasicDOSProtector.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Servers.HttpServer
    /// </remarks>
    public abstract class BaseStreamHandlerBasicDOSProtector : BaseRequestHandler, IStreamedRequestHandler
    {
-       
        private readonly BasicDosProtectorOptions _options;
        private readonly BasicDOSProtector _dosProtector;
@@ -63,7 +63,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                result = ThrottledRequest(path, request, httpRequest, httpResponse);
            if (_options.MaxConcurrentSessions > 0)
                _dosProtector.ProcessEnd(clientstring, endpoint);
-            
            RequestsHandled++;
            return result;
@@ -81,7 +81,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            return new byte[0];
        }
-        
        private string GetRemoteAddr(IOSHttpRequest httpRequest)
        {
            string remoteaddr = string.Empty;
@@ -101,7 +101,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                clientstring = GetRemoteAddr(httpRequest);
            return clientstring;
-           
        }
    }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
index cd4b8ff..98d33e4 100644
--- a/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/GenericHTTPBasicDOSProtector.cs
@@ -33,7 +33,7 @@ namespace OpenSim.Framework.Servers.HttpServer
    {
        private readonly GenericHTTPMethod _normalMethod;
        private readonly GenericHTTPMethod _throttledMethod;
-      
        private readonly BasicDosProtectorOptions _options;
        private readonly BasicDOSProtector _dosProtector;
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        {
            _normalMethod = normalMethod;
            _throttledMethod = throttledMethod;
-            
            _options = options;
            _dosProtector = new BasicDOSProtector(_options);
        }
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            return process;
        }
-        
        private string GetRemoteAddr(Hashtable request)
        {
            string remoteaddr = "";
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
index d162bc1..3a04074 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IHttpServer.cs
@@ -45,26 +45,26 @@ namespace OpenSim.Framework.Servers.HttpServer
 //        // the handlers - it is NOT required to be an actual agent header
 //        // value.
 //        bool AddAgentHandler(string agent, IHttpAgentHandler handler);
-        
        /// <summary>
        /// Add a handler for an HTTP request.
        /// </summary>
        /// <remarks>
-        /// This handler can actually be invoked either as 
+        /// This handler can actually be invoked either as
-        /// 
+        ///
-        /// http://<hostname>:<port>/?method=<methodName> 
+        /// http://<hostname>:<port>/?method=<methodName>
-        /// 
+        ///
        /// or
-        /// 
+        ///
        /// http://<hostname>:<port><method>
-        /// 
+        ///
        /// if the method name starts with a slash.  For example, AddHTTPHandler("/object/", ...) on a standalone region
        /// server will register a handler that can be invoked with either
-        /// 
+        ///
        /// http://localhost:9000/?method=/object/
-        /// 
+        ///
        /// or
-        /// 
+        ///
        /// http://localhost:9000/object/
        ///
        /// In addition, the handler invoked by the HTTP server for any request is the one when best matches the request
@@ -87,7 +87,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        /// <param name="handler">handle the LLSD response</param>
        /// <returns></returns>
        bool AddLLSDHandler(string path, LLSDMethod handler);
-        
        /// <summary>
        /// Add a stream handler to the http server.  If the handler already exists, then nothing happens.
        /// </summary>
@@ -98,7 +98,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        bool AddXmlRPCHandler(string method, XmlRpcMethod handler, bool keepAlive);
        bool AddJsonRPCHandler(string method, JsonRPCMethod handler);
-        
        /// <summary>
        /// Websocket HTTP server handlers.
        /// </summary>
@@ -108,7 +108,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        void RemoveWebSocketHandler(string servicepath);
-       
        /// <summary>
        /// Gets the XML RPC handler for given method name
        /// </summary>
@@ -125,7 +125,7 @@ namespace OpenSim.Framework.Servers.HttpServer
 //        /// <param name="handler"></param>
 //        /// <returns></returns>
 //        bool RemoveAgentHandler(string agent, IHttpAgentHandler handler);
-        
        /// <summary>
        /// Remove an HTTP handler
        /// </summary>
@@ -134,15 +134,15 @@ namespace OpenSim.Framework.Servers.HttpServer
        void RemoveHTTPHandler(string httpMethod, string path);
        void RemovePollServiceHTTPHandler(string httpMethod, string path);
-        
        bool RemoveLLSDHandler(string path, LLSDMethod handler);
-        
        void RemoveStreamHandler(string httpMethod, string path);
        void RemoveXmlRPCHandler(string method);
        void RemoveJsonRPCHandler(string method);
-        
        string GetHTTP404(string host);
        string GetHTTP500();
diff --git a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
index b8541cb..62d92fb 100644
--- a/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Interfaces/IStreamHandler.cs
@@ -83,7 +83,7 @@ namespace OpenSim.Framework.Servers.HttpServer
    {
        void Handle(string path, Stream request, Stream response, IOSHttpRequest httpReqbuest, IOSHttpResponse httpResponse);
    }
-    
    public interface IGenericHTTPHandler : IRequestHandler
    {
        Hashtable Handle(string path, Hashtable request);
diff --git a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs
index 2fe1a7d..411ee31 100644
--- a/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/JsonRpcRequestManager.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Framework.Servers.HttpServer
    public class JsonRpcRequestManager
    {
        static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
        public JsonRpcRequestManager()
        {
        }
@@ -77,6 +77,9 @@ namespace OpenSim.Framework.Servers.HttpServer
            if (parameters == null)
                throw new ArgumentNullException("parameters");
+            if(string.IsNullOrWhiteSpace(uri))
+                return false;
            OSDMap request = new OSDMap();
            request.Add("jsonrpc", OSD.FromString("2.0"));
            request.Add("id", OSD.FromString(jsonId));
@@ -185,6 +188,6 @@ namespace OpenSim.Framework.Servers.HttpServer
            return true;
        }
-    
    }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/JsonRpcResponse.cs b/OpenSim/Framework/Servers/HttpServer/JsonRpcResponse.cs
index 2c50587..91d284b 100644
--- a/OpenSim/Framework/Servers/HttpServer/JsonRpcResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/JsonRpcResponse.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            {
            }
-            return result; 
+            return result;
        }
    }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
index 05ec6dc..1a6b8cf 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
@@ -155,11 +155,11 @@ namespace OpenSim.Framework.Servers.HttpServer
        private string _userAgent;
        internal IHttpRequest IHttpRequest
-        { 
+        {
            get { return _request; }
        }
-        internal IHttpClientContext IHttpClientContext 
+        internal IHttpClientContext IHttpClientContext
        {
            get { return _context; }
        }
@@ -192,19 +192,19 @@ namespace OpenSim.Framework.Servers.HttpServer
                    // ignore
                }
            }
-            
            if (null != req.Headers["content-type"])
                _contentType = _request.Headers["content-type"];
            if (null != req.Headers["user-agent"])
                _userAgent = req.Headers["user-agent"];
-            
            if (null != req.Headers["remote_addr"])
            {
                try
                {
                    IPAddress addr = IPAddress.Parse(req.Headers["remote_addr"]);
                    // sometimes req.Headers["remote_port"] returns a comma separated list, so use
-                    // the first one in the list and log it 
+                    // the first one in the list and log it
                    string[] strPorts = req.Headers["remote_port"].Split(new char[] { ',' });
                    if (strPorts.Length > 1)
                    {
@@ -216,7 +216,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                }
                catch (FormatException)
                {
-                    _log.ErrorFormat("[OSHttpRequest]: format exception on addr/port {0}:{1}, ignoring", 
+                    _log.ErrorFormat("[OSHttpRequest]: format exception on addr/port {0}:{1}, ignoring",
                                     req.Headers["remote_addr"], req.Headers["remote_port"]);
                }
            }
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
index 89fb5d4..d7744fc 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        public bool KeepAlive
        {
-            get 
+            get
            {
                return _httpResponse.Connection == ConnectionType.KeepAlive;
            }
@@ -148,6 +148,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    _httpResponse.Connection = ConnectionType.Close;
                    _httpResponse.KeepAlive = 0;
                }
                else
                {
                    _httpResponse.Connection = ConnectionType.KeepAlive;
@@ -320,6 +321,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        public void Send()
        {
            _httpResponse.Body.Flush();
            _httpResponse.Send();
        }
diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs
index a736c8b..88e3068 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpStatusCodes.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        /// 300 Redirect: different presentation forms available, take a pick
        /// </summary>
        RedirectMultipleChoices = 300,
-        
        /// <summary>
        /// 301 Redirect: requested resource has moved and now lives somewhere else
        /// </summary>
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
index 9477100..7150aad 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
@@ -46,13 +46,15 @@ namespace OpenSim.Framework.Servers.HttpServer
        public RequestMethod Request;
        public UUID Id;
        public int TimeOutms;
-        public EventType Type;    
+        public EventType Type;
        public enum EventType : int
        {
-            LongPoll = 0,
+            Poll = 0,
            LslHttp = 1,
-            Inventory = 2
+            Inventory = 2,
+            Texture = 3,
+            Mesh = 4
        }
        public string Url { get; set; }
@@ -80,7 +82,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            NoEvents = pNoEvents;
            Id = pId;
            TimeOutms = pTimeOutms;
-            Type = EventType.LongPoll;
+            Type = EventType.Poll;
        }
    }
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
index caf0e98..fefcb20 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceHttpRequest.cs
@@ -27,6 +27,7 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
 using HttpServer;
@@ -44,6 +45,24 @@ namespace OpenSim.Framework.Servers.HttpServer
        public readonly IHttpRequest Request;
        public readonly int RequestTime;
        public readonly UUID RequestID;
+        public int  contextHash;
+        private void GenContextHash()
+        {
+            Random rnd = new Random();
+            contextHash = 0;
+            if (Request.Headers["remote_addr"] != null)
+                contextHash = (Request.Headers["remote_addr"]).GetHashCode() << 16;
+            else
+                contextHash = rnd.Next() << 16;
+            if (Request.Headers["remote_port"] != null)
+            {
+                string[] strPorts = Request.Headers["remote_port"].Split(new char[] { ',' });
+                contextHash += Int32.Parse(strPorts[0]);
+            }
+            else
+                contextHash += rnd.Next() & 0xffff;
+        }
        public PollServiceHttpRequest(
            PollServiceEventArgs pPollServiceArgs, IHttpClientContext pHttpContext, IHttpRequest pRequest)
@@ -53,6 +72,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            Request = pRequest;
            RequestTime = System.Environment.TickCount;
            RequestID = UUID.Random();
+            GenContextHash();
        }
        internal void DoHTTPGruntWork(BaseHttpServer server, Hashtable responsedata)
@@ -62,36 +82,69 @@ namespace OpenSim.Framework.Servers.HttpServer
            byte[] buffer = server.DoHTTPGruntWork(responsedata, response);
+            if(Request.Body.CanRead)
+                Request.Body.Dispose();
            response.SendChunked = false;
            response.ContentLength64 = buffer.Length;
            response.ContentEncoding = Encoding.UTF8;
+            response.ReuseContext = false;
            try
            {
                response.OutputStream.Write(buffer, 0, buffer.Length);
+                response.OutputStream.Flush();
+                response.Send();
+                buffer = null;
            }
            catch (Exception ex)
            {
                m_log.Warn("[POLL SERVICE WORKER THREAD]: Error ", ex);
            }
-            finally
+            PollServiceArgs.RequestsHandled++;
+        }
+        internal void DoHTTPstop(BaseHttpServer server)
+        {
+            OSHttpResponse response
+                = new OSHttpResponse(new HttpResponse(HttpContext, Request), HttpContext);
+            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.Close();
+                response.OutputStream.Flush();
-                try
+                response.Send();
-                {
-                    response.OutputStream.Flush();
-                    response.Send();
-                    //if (!response.KeepAlive && response.ReuseContext)
-                    //    response.FreeContext();
-                }
-                catch (Exception e)
-                {
-                    m_log.Warn("[POLL SERVICE WORKER THREAD]: Error ", e);
-                }
-                PollServiceArgs.RequestsHandled++;
            }
+            catch (Exception e)
+            {
+            }
+        }
+    }
+    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 28bba70..c6a3e65 100644
--- a/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
+++ b/OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
@@ -44,200 +44,183 @@ namespace OpenSim.Framework.Servers.HttpServer
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        /// <summary>
-        /// Is the poll service request manager running?
-        /// </summary>
-        /// <remarks>
-        /// Can be running either synchronously or asynchronously
-        /// </remarks>
-        public bool IsRunning { get; private set; }
-        /// <summary>
-        /// Is the poll service performing responses asynchronously (with its own threads) or synchronously (via
-        /// external calls)?
-        /// </summary>
-        public bool PerformResponsesAsync { get; private set; }
-        /// <summary>
-        /// Number of responses actually processed and sent to viewer (or aborted due to error).
-        /// </summary>
-        public int ResponsesProcessed { get; private set; }
        private readonly BaseHttpServer m_server;
+        private Dictionary<PollServiceHttpRequest, Queue<PollServiceHttpRequest>> m_bycontext;
        private BlockingQueue<PollServiceHttpRequest> m_requests = new BlockingQueue<PollServiceHttpRequest>();
-        private static List<PollServiceHttpRequest> m_longPollRequests = new List<PollServiceHttpRequest>();
+        private static Queue<PollServiceHttpRequest> m_retryRequests = new Queue<PollServiceHttpRequest>();
        private uint m_WorkerThreadCount = 0;
        private Thread[] m_workerThreads;
+        private Thread m_retrysThread;
-        private SmartThreadPool m_threadPool = new SmartThreadPool(20000, 12, 2);
+        private bool m_running = false;
-//        private int m_timeout = 1000;   //  increase timeout 250; now use the event one
+        private SmartThreadPool m_threadPool;
        public PollServiceRequestManager(
            BaseHttpServer pSrv, bool performResponsesAsync, uint pWorkerThreadCount, int pTimeout)
        {
            m_server = pSrv;
-            PerformResponsesAsync = performResponsesAsync;
            m_WorkerThreadCount = pWorkerThreadCount;
            m_workerThreads = new Thread[m_WorkerThreadCount];
-            StatsManager.RegisterStat(
+            PollServiceHttpRequestComparer preqCp = new PollServiceHttpRequestComparer();
-                new Stat(
+            m_bycontext = new Dictionary<PollServiceHttpRequest, Queue<PollServiceHttpRequest>>(preqCp);
-                    "QueuedPollResponses",
-                    "Number of poll responses queued for processing.",
+            STPStartInfo startInfo = new STPStartInfo();
-                    "",
+            startInfo.IdleTimeout = 30000;
-                    "",
+            startInfo.MaxWorkerThreads = 20;
-                    "httpserver",
+            startInfo.MinWorkerThreads = 1;
-                    m_server.Port.ToString(),
+            startInfo.ThreadPriority = ThreadPriority.Normal;
-                    StatType.Pull,
+            startInfo.StartSuspended = true;
-                    MeasuresOfInterest.AverageChangeOverTime,
+            startInfo.ThreadPoolName = "PoolService";
-                    stat => stat.Value = m_requests.Count(),
-                    StatVerbosity.Debug));
+            m_threadPool = new SmartThreadPool(startInfo);
-            StatsManager.RegisterStat(
-                new Stat(
-                    "ProcessedPollResponses",
-                    "Number of poll responses processed.",
-                    "",
-                    "",
-                    "httpserver",
-                    m_server.Port.ToString(),
-                    StatType.Pull,
-                    MeasuresOfInterest.AverageChangeOverTime,
-                    stat => stat.Value = ResponsesProcessed,
-                    StatVerbosity.Debug));
        }
        public void Start()
        {
-            IsRunning = true;
+            m_running = true;
+            m_threadPool.Start();
-            if (PerformResponsesAsync)
+            //startup worker threads
+            for (uint i = 0; i < m_WorkerThreadCount; i++)
            {
-                //startup worker threads
+                m_workerThreads[i]
-                for (uint i = 0; i < m_WorkerThreadCount; i++)
+                    = WorkManager.StartThread(
-                {
+                        PoolWorkerJob,
-                    m_workerThreads[i]
+                        string.Format("PollServiceWorkerThread {0}:{1}", i, m_server.Port),
-                        = WorkManager.StartThread(
+                        ThreadPriority.Normal,
-                            PoolWorkerJob,
+                        true,
-                            string.Format("PollServiceWorkerThread{0}:{1}", i, m_server.Port),
+                        false,
-                            ThreadPriority.Normal,
+                        null,
-                            false,
+                        int.MaxValue);
-                            false,
-                            null,
-                            int.MaxValue);
-                }
-                WorkManager.StartThread(
-                    this.CheckLongPollThreads,
-                    string.Format("LongPollServiceWatcherThread:{0}", m_server.Port),
-                    ThreadPriority.Normal,
-                    false,
-                    true,
-                    null,
-                    1000 * 60 * 10);
            }
+            m_retrysThread = WorkManager.StartThread(
+                this.CheckRetries,
+                string.Format("PollServiceWatcherThread:{0}", m_server.Port),
+                ThreadPriority.Normal,
+                true,
+                true,
+                null,
+                1000 * 60 * 10);
        }
        private void ReQueueEvent(PollServiceHttpRequest req)
        {
-            if (IsRunning)
+            if (m_running)
            {
-                // delay the enqueueing for 100ms. There's no need to have the event
+                lock (m_retryRequests)
-                // actively on the queue
+                    m_retryRequests.Enqueue(req);
-                Timer t = new Timer(self => {
-                    ((Timer)self).Dispose();
-                    m_requests.Enqueue(req);
-                });
-                t.Change(100, Timeout.Infinite);
            }
        }
        public void Enqueue(PollServiceHttpRequest req)
        {
-            if (IsRunning)
+            lock (m_bycontext)
            {
-                if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll)
+                Queue<PollServiceHttpRequest> ctxQeueue;
+                if (m_bycontext.TryGetValue(req, out ctxQeueue))
                {
-                    lock (m_longPollRequests)
+                    ctxQeueue.Enqueue(req);
-                        m_longPollRequests.Add(req);
                }
                else
-                    m_requests.Enqueue(req);
+                {
+                    ctxQeueue = new Queue<PollServiceHttpRequest>();
+                    m_bycontext[req] = ctxQeueue;
+                    EnqueueInt(req);
+                }
            }
        }
-        private void CheckLongPollThreads()
+        public void byContextDequeue(PollServiceHttpRequest req)
        {
-            // The only purpose of this thread is to check the EQs for events.
+            Queue<PollServiceHttpRequest> ctxQeueue;
-            // If there are events, that thread will be placed in the "ready-to-serve" queue, m_requests.
+            lock (m_bycontext)
-            // If there are no events, that thread will be back to its "waiting" queue, m_longPollRequests.
-            // All other types of tasks (Inventory handlers, http-in, etc) don't have the long-poll nature,
-            // so if they aren't ready to be served by a worker thread (no events), they are placed 
-            // directly back in the "ready-to-serve" queue by the worker thread.
-            while (IsRunning)
            {
-                Thread.Sleep(500); 
+                if (m_bycontext.TryGetValue(req, out ctxQeueue))
-                Watchdog.UpdateThread();
-//                List<PollServiceHttpRequest> not_ready = new List<PollServiceHttpRequest>();
-                lock (m_longPollRequests)
                {
-                    if (m_longPollRequests.Count > 0 && IsRunning)
+                    if (ctxQeueue.Count > 0)
+                    {
+                        PollServiceHttpRequest newreq = ctxQeueue.Dequeue();
+                        EnqueueInt(newreq);
+                    }
+                    else
                    {
-                        List<PollServiceHttpRequest> ready = m_longPollRequests.FindAll(req =>
+                        m_bycontext.Remove(req);
-                            (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id) || // there are events in this EQ
+                    }
-                            (Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms) // no events, but timeout
+                }
-                            );
+            }
+        }
-                        ready.ForEach(req =>
+        public void EnqueueInt(PollServiceHttpRequest req)
-                            {
+        {
-                                m_requests.Enqueue(req);
+            if (m_running)
-                                m_longPollRequests.Remove(req);
+                m_requests.Enqueue(req);
-                            });
+        }
-                    }
+        private void CheckRetries()
+        {
+            while (m_running)
+            {
+                Thread.Sleep(100); // let the world move  .. back to faster rate
+                Watchdog.UpdateThread();
+                lock (m_retryRequests)
+                {
+                    while (m_retryRequests.Count > 0 && m_running)
+                        m_requests.Enqueue(m_retryRequests.Dequeue());
                }
            }
        }
        public void Stop()
        {
-            IsRunning = false;
+            m_running = false;
-//            m_timeout = -10000; // cause all to expire
-            Thread.Sleep(1000); // let the world move
+            Thread.Sleep(100); // let the world move
            foreach (Thread t in m_workerThreads)
                Watchdog.AbortThread(t.ManagedThreadId);
-            PollServiceHttpRequest wreq;
+            m_threadPool.Shutdown();
+            // any entry in m_bycontext should have a active request on the other queues
+            // so just delete contents to easy GC
+            foreach (Queue<PollServiceHttpRequest> qu in m_bycontext.Values)
+                qu.Clear();
+            m_bycontext.Clear();
-            lock (m_longPollRequests)
+            try
+            {
+                foreach (PollServiceHttpRequest req in m_retryRequests)
+                {
+                    req.DoHTTPstop(m_server);
+                }
+            }
+            catch
            {
-                if (m_longPollRequests.Count > 0 && IsRunning)
-                    m_longPollRequests.ForEach(req => m_requests.Enqueue(req));
            }
+            PollServiceHttpRequest wreq;
+            m_retryRequests.Clear();
            while (m_requests.Count() > 0)
            {
                try
                {
                    wreq = m_requests.Dequeue(0);
-                    ResponsesProcessed++;
+                    wreq.DoHTTPstop(m_server);
-                    wreq.DoHTTPGruntWork(
-                        m_server, wreq.PollServiceArgs.NoEvents(wreq.RequestID, wreq.PollServiceArgs.Id));
                }
                catch
                {
                }
            }
-            m_longPollRequests.Clear();
            m_requests.Clear();
        }
@@ -245,87 +228,69 @@ namespace OpenSim.Framework.Servers.HttpServer
        private void PoolWorkerJob()
        {
-            while (IsRunning)
+            while (m_running)
            {
+                PollServiceHttpRequest req = m_requests.Dequeue(4500);
                Watchdog.UpdateThread();
-                WaitPerformResponse();
+                if (req != null)
-            }
-        }
-        public void WaitPerformResponse()
-        {
-            PollServiceHttpRequest req = m_requests.Dequeue(5000);
-//            m_log.DebugFormat("[YYY]: Dequeued {0}", (req == null ? "null" : req.PollServiceArgs.Type.ToString()));
-            if (req != null)
-            {
-                try
                {
-                    if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
+                    try
                    {
-                        Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
+                        if (req.PollServiceArgs.HasEvents(req.RequestID, req.PollServiceArgs.Id))
-                        if (responsedata == null)
-                            return;
-                        // This is the event queue.
-                        // Even if we're not running we can still perform responses by explicit request.
-                        if (req.PollServiceArgs.Type == PollServiceEventArgs.EventType.LongPoll 
-                            || !PerformResponsesAsync) 
-                        {
-                            try
-                            {
-                                ResponsesProcessed++;
-                                req.DoHTTPGruntWork(m_server, responsedata);
-                            }
-                            catch (ObjectDisposedException e) // Browser aborted before we could read body, server closed the stream
-                            {
-                                // Ignore it, no need to reply
-                                m_log.Error(e);
-                            }
-                        }
-                        else
                        {
+                            Hashtable responsedata = req.PollServiceArgs.GetEvents(req.RequestID, req.PollServiceArgs.Id);
                            m_threadPool.QueueWorkItem(x =>
                            {
                                try
                                {
-                                    ResponsesProcessed++;
                                    req.DoHTTPGruntWork(m_server, responsedata);
                                }
-                                catch (ObjectDisposedException e) // Browser aborted before we could read body, server closed the stream
+                                catch (ObjectDisposedException)
                                {
-                                    // Ignore it, no need to reply
-                                    m_log.Error(e);
                                }
-                                catch (Exception e)
+                                finally
                                {
-                                    m_log.Error(e);
+                                    byContextDequeue(req);
                                }
                                return null;
                            }, null);
                        }
-                    }
-                    else
-                    {
-                        if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
-                        {
-                            ResponsesProcessed++;
-                            req.DoHTTPGruntWork(
-                                m_server, req.PollServiceArgs.NoEvents(req.RequestID, req.PollServiceArgs.Id));
-                        }
                        else
                        {
-                            ReQueueEvent(req);
+                            if ((Environment.TickCount - req.RequestTime) > req.PollServiceArgs.TimeOutms)
+                            {
+                                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 (Exception e)
+                    {
-                {
+                        m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
-                    m_log.ErrorFormat("Exception in poll service thread: " + e.ToString());
+                    }
                }
            }
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
index 5e630dc..9b663ba 100644
--- a/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Servers/HttpServer/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Framework.Servers.HttpServer")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
+// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from 
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
@@ -25,9 +25,9 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.3.*")]
+[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
diff --git a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
index bd55657..67fc14e 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestDeserialiseHandler.cs
@@ -54,6 +54,8 @@ 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 ad69cd2..158befa 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestSessionService.cs
@@ -210,6 +210,8 @@ namespace OpenSim.Framework.Servers.HttpServer
            {
                try
                {
+                    xmlReader.ProhibitDtd = true;
                    XmlSerializer deserializer = new XmlSerializer(typeof(RestSessionObject<TRequest>));
                    deserial = (RestSessionObject<TRequest>)deserializer.Deserialize(xmlReader);
                }
@@ -269,6 +271,8 @@ namespace OpenSim.Framework.Servers.HttpServer
            {
                try
                {
+                    xmlReader.ProhibitDtd = true;
                    XmlSerializer deserializer = new XmlSerializer(typeof(TRequest));
                    deserial = (TRequest)deserializer.Deserialize(xmlReader);
                }
@@ -291,5 +295,5 @@ namespace OpenSim.Framework.Servers.HttpServer
                serializer.Serialize(xmlWriter, response);
            }
        }
-    }   
+    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs b/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
index 0305dee..dfc2715 100644
--- a/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/RestStreamHandler.cs
@@ -50,11 +50,10 @@ namespace OpenSim.Framework.Servers.HttpServer
        protected override byte[] ProcessRequest(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
+            string requestBody;
            Encoding encoding = Encoding.UTF8;
-            StreamReader streamReader = new StreamReader(request, encoding);
+            using(StreamReader streamReader = new StreamReader(request,encoding))
+                requestBody = streamReader.ReadToEnd();
-            string requestBody = streamReader.ReadToEnd();
-            streamReader.Close();
            string param = GetParam(path);
            string responseString = m_restMethod(requestBody, path, param, httpRequest, httpResponse);
diff --git a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
index c2925e3..c8af90f 100644
--- a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        public event PongDelegate OnPong;
        /// <summary>
-        /// This is a regular HTTP Request...    This may be removed in the future.   
+        /// This is a regular HTTP Request...    This may be removed in the future.
        /// </summary>
 //        public event RegularHttpRequestDelegate OnRegularHttpRequest;
@@ -93,9 +93,9 @@ namespace OpenSim.Framework.Servers.HttpServer
        /// When the websocket is closed, this will be fired.
        /// </summary>
        public event CloseDelegate OnClose;
-        
        /// <summary>
-        /// Set this delegate to allow your module to validate the origin of the 
+        /// Set this delegate to allow your module to validate the origin of the
        /// Websocket request.  Primary line of defense against cross site scripting
        /// </summary>
        public ValidateHandshake HandshakeValidateMethodOverride = null;
@@ -181,7 +181,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                {
                    throw new InvalidOperationException("The socket has been shutdown");
                }
-            } 
+            }
            set
            {
                if (_networkContext != null && _networkContext.Socket != null)
@@ -194,8 +194,8 @@ namespace OpenSim.Framework.Servers.HttpServer
        }
        /// <summary>
-        /// This triggers the websocket to start the upgrade process...  
+        /// This triggers the websocket to start the upgrade process...
-        /// This is a Generalized Networking 'common sense' helper method.  Some people expect to call Start() instead 
+        /// This is a Generalized Networking 'common sense' helper method.  Some people expect to call Start() instead
        /// of the more context appropriate HandshakeAndUpgrade()
        /// </summary>
        public void Start()
@@ -261,7 +261,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    acceptKey = GenerateAcceptKey(websocketKey);
                    string rawaccept = string.Format(HandshakeAcceptText, acceptKey);
                    SendUpgradeSuccess(rawaccept);
-                    
                }
                else
@@ -282,7 +282,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        }
        /// <summary>
-        /// Generates a handshake response key string based on the client's 
+        /// Generates a handshake response key string based on the client's
        /// provided key to prove to the client that we're allowing the Websocket
        /// upgrade of our own free will and we were not coerced into doing it.
        /// </summary>
@@ -298,7 +298,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            SHA1 hashobj = SHA1.Create();
            string ret = Convert.ToBase64String(hashobj.ComputeHash(Encoding.UTF8.GetBytes(acceptkey)));
            hashobj.Clear();
-            
            return ret;
        }
@@ -310,11 +310,11 @@ namespace OpenSim.Framework.Servers.HttpServer
        {
            // Create a new websocket state so we can keep track of data in between network reads.
            WebSocketState socketState = new WebSocketState() { ReceivedBytes = new List<byte>(), Header = WebsocketFrameHeader.HeaderDefault(), FrameComplete = true};
-            
            byte[] bhandshakeResponse = Encoding.UTF8.GetBytes(pHandshakeResponse);
-            
-           
            try
            {
@@ -324,7 +324,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                }
                // Begin reading the TCP stream before writing the Upgrade success message to the other side of the stream.
                _networkContext.Stream.BeginRead(_buffer, 0, _bufferLength, OnReceive, socketState);
-                
                // Write the upgrade handshake success message
                _networkContext.Stream.Write(bhandshakeResponse, 0, bhandshakeResponse.Length);
                _networkContext.Stream.Flush();
@@ -345,7 +345,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            catch (ObjectDisposedException)
            {
                Close(string.Empty);
-            }           
+            }
        }
        /// <summary>
@@ -369,7 +369,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        /// <summary>
        /// This is our ugly Async OnReceive event handler.
-        /// This chunks the input stream based on the length of the provided buffer and processes out 
+        /// This chunks the input stream based on the length of the provided buffer and processes out
        /// as many frames as it can.   It then moves the unprocessed data to the beginning of the buffer.
        /// </summary>
        /// <param name="ar">Our Async State from beginread</param>
@@ -390,7 +390,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                if (_bufferPosition > _bufferLength)
                {
-                    // Message too big for chunksize..   not sure how this happened...  
+                    // Message too big for chunksize..   not sure how this happened...
                    //Close(string.Empty);
                }
@@ -413,7 +413,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                            if (pheader.PayloadLen > (ulong) _maxPayloadBytes)
                            {
                                Close("Invalid Payload size");
-                                
                                return;
                            }
                            if (pheader.PayloadLen > 0)
@@ -487,7 +487,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                            _socketState.ReceivedBytes.Clear();
                            _socketState.ExpectedBytes = 0;
                            // do some processing
-                        }                       
+                        }
                    }
                }
                if (offset > 0)
@@ -504,7 +504,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                }
                else
                {
-                    // We can't read the stream anymore...  
+                    // We can't read the stream anymore...
                }
            }
            catch (IOException)
@@ -533,7 +533,7 @@ namespace OpenSim.Framework.Servers.HttpServer
            textMessageFrame.Header.Opcode = WebSocketReader.OpCode.Text;
            textMessageFrame.Header.IsEnd = true;
            SendSocket(textMessageFrame.ToBytes());
-            
        }
        public void SendData(byte[] data)
@@ -657,7 +657,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    SendSocket(pongFrame.ToBytes());
                    break;
                case WebSocketReader.OpCode.Pong:
-                 
                    PongDelegate pongD = OnPong;
                    if (pongD != null)
                    {
@@ -701,7 +701,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                        {
                            textD(this, new WebsocketTextEventArgs() { Data = Encoding.UTF8.GetString(psocketState.ReceivedBytes.ToArray()) });
                        }
-                        
                        // Send Done Event!
                    }
                    break;
@@ -719,7 +719,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    {
                        if (psocketState.ContinuationFrame.Header.Opcode == WebSocketReader.OpCode.Text)
                        {
-                            // Send Done event    
+                            // Send Done event
                            TextDelegate textD = OnText;
                            if (textD != null)
                            {
@@ -744,9 +744,9 @@ namespace OpenSim.Framework.Servers.HttpServer
                    break;
                case WebSocketReader.OpCode.Close:
                    Close(string.Empty);
-                    
                    break;
-               
            }
            psocketState.Header.SetDefault();
            psocketState.ReceivedBytes.Clear();
@@ -837,12 +837,12 @@ namespace OpenSim.Framework.Servers.HttpServer
        }
        /// <summary>
-        /// Attempts to read a header off the provided buffer.  Returns true, exports a WebSocketFrameheader, 
+        /// Attempts to read a header off the provided buffer.  Returns true, exports a WebSocketFrameheader,
        /// and an int to move the buffer forward when it reads a header.  False when it can't read a header
        /// </summary>
        /// <param name="pBuffer">Bytes read from the stream</param>
        /// <param name="pOffset">Starting place in the stream to begin trying to read from</param>
-        /// <param name="length">Lenth in the stream to try and read from.  Provided for cases where the 
+        /// <param name="length">Lenth in the stream to try and read from.  Provided for cases where the
        /// buffer's length is larger then the data in it</param>
        /// <param name="oHeader">Outputs the read WebSocket frame header</param>
        /// <param name="moveBuffer">Informs the calling stream to move the buffer forward</param>
@@ -897,7 +897,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    oHeader.PayloadLen = BitConverter.ToUInt16(pBuffer, pOffset + index);
                    index += 2;
                    break;
-                case 127:   // we got more this is a bigger frame  
+                case 127:   // we got more this is a bigger frame
                    // 8 bytes - uint64 - most significant bit 0  network byte order
                    minumheadersize += 8;
                    if (length < minumheadersize)
@@ -909,7 +909,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                    oHeader.PayloadLen = BitConverter.ToUInt64(pBuffer, pOffset + index);
                    index += 8;
                    break;
-                
            }
            //oHeader.PayloadLeft = oHeader.PayloadLen; // Start the count in case it's chunked over the network.  This is different then frame fragmentation
            if (oHeader.IsMasked)
@@ -937,9 +937,9 @@ namespace OpenSim.Framework.Servers.HttpServer
        /*
         * RFC6455
 nib   0       1       2       3       4       5       6       7
-byt   0               1               2               3               
+byt   0               1               2               3
-dec   0                   1                   2                   3   
+dec   0                   1                   2                   3
-      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 
+      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
     +-+-+-+-+-------+-+-------------+-------------------------------+
     |F|R|R|R| opcode|M| Payload len |    Extended payload length    |
     |I|S|S|S|  (4)  |A|     (7)     |             (16/64)           +
@@ -963,7 +963,7 @@ dec   0                   1                   2                   3
        public static readonly WebSocketFrame DefaultFrame = new WebSocketFrame(){Header = new WebsocketFrameHeader(),WebSocketPayload = new byte[0]};
        public WebsocketFrameHeader Header;
        public byte[] WebSocketPayload;
-        
        public byte[] ToBytes()
        {
            Header.PayloadLen = (ulong)WebSocketPayload.Length;
@@ -991,7 +991,7 @@ dec   0                   1                   2                   3
        public int Mask;
        /*
 byt   0               1               2               3
-      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 
+      0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
     +---------------+---------------+---------------+---------------+
     |    Octal 1    |    Octal 2    |    Octal 3    |    Octal 4    |
     +---------------+---------------+---------------+---------------+
@@ -1002,11 +1002,11 @@ byt   0               1               2               3
        public UInt64 PayloadLen;
        //public UInt64 PayloadLeft;
-        // Payload is X + Y   
+        // Payload is X + Y
        //public UInt64 ExtensionDataLength;
        //public UInt64 ApplicationDataLength;
        public static readonly WebsocketFrameHeader ZeroHeader = WebsocketFrameHeader.HeaderDefault();
-       
        public void SetDefault()
        {
@@ -1025,16 +1025,16 @@ byt   0               1               2               3
        /// <summary>
        /// Returns a byte array representing the Frame header
        /// </summary>
-        /// <param name="payload">This is the frame data payload.  The header describes the size of the payload. 
+        /// <param name="payload">This is the frame data payload.  The header describes the size of the payload.
        /// If payload is null, a Zero sized payload is assumed</param>
        /// <returns>Returns a byte array representing the frame header</returns>
        public byte[] ToBytes(byte[] payload)
        {
            List<byte> result = new List<byte>();
-           
            // Squeeze in our opcode and our ending bit.
            result.Add((byte)((byte)Opcode | (IsEnd?0x80:0x00) ));
-           
            // Again with the three different byte interpretations of size..
            //bytesize
@@ -1056,7 +1056,7 @@ byt   0               1               2               3
                Array.Reverse(payloadLengthByte);
                result.AddRange(payloadLengthByte);
            }
-            
            // Only add a payload if it's not null
            if (payload != null)
            {
@@ -1155,5 +1155,5 @@ byt   0               1               2               3
    }
-   
 }
diff --git a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
index f212208..6b2c0ab 100644
--- a/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
+++ b/OpenSim/Framework/Servers/HttpServer/XmlRpcBasicDOSProtector.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Servers.HttpServer
    {
        private readonly XmlRpcMethod _normalMethod;
        private readonly XmlRpcMethod _throttledMethod;
-       
        private readonly BasicDosProtectorOptions _options;
        private readonly BasicDOSProtector _dosProtector;
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Servers.HttpServer
        {
            _normalMethod = normalMethod;
            _throttledMethod = throttledMethod;
-           
            _options = options;
            _dosProtector = new BasicDOSProtector(_options);
@@ -87,5 +87,5 @@ namespace OpenSim.Framework.Servers.HttpServer
    }
-    
 }
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 57931d4..9b1d906 100644
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -223,11 +223,11 @@ namespace OpenSim.Framework.Servers
                {
                    handlers.AppendFormat(
                        "Registered HTTP Handlers for server at {0}:{1}\n", httpServer.ListenIPAddress, httpServer.Port);
-        
                    handlers.AppendFormat("* XMLRPC:\n");
                    foreach (String s in httpServer.GetXmlRpcHandlerKeys())
                        handlers.AppendFormat("\t{0}\n", s);
-        
                    handlers.AppendFormat("* HTTP:\n");
                    foreach (String s in httpServer.GetHTTPHandlerKeys())
                        handlers.AppendFormat("\t{0}\n", s);
@@ -235,19 +235,19 @@ namespace OpenSim.Framework.Servers
                    handlers.AppendFormat("* HTTP (poll):\n");
                    foreach (String s in httpServer.GetPollServiceHandlerKeys())
                        handlers.AppendFormat("\t{0}\n", s);
-                    
                    handlers.AppendFormat("* JSONRPC:\n");
                    foreach (String s in httpServer.GetJsonRpcHandlerKeys())
                        handlers.AppendFormat("\t{0}\n", s);
-        
 //                    handlers.AppendFormat("* Agent:\n");
 //                    foreach (String s in httpServer.GetAgentHandlerKeys())
 //                        handlers.AppendFormat("\t{0}\n", s);
-        
                    handlers.AppendFormat("* LLSD:\n");
                    foreach (String s in httpServer.GetLLSDHandlerKeys())
                        handlers.AppendFormat("\t{0}\n", s);
-        
                    handlers.AppendFormat("* StreamHandlers ({0}):\n", httpServer.GetStreamHandlerKeys().Count);
                    foreach (String s in httpServer.GetStreamHandlerKeys())
                        handlers.AppendFormat("\t{0}\n", s);
@@ -334,7 +334,7 @@ namespace OpenSim.Framework.Servers
        {
            if (port == 0)
                return Instance;
-            
            if (instance != null && port == Instance.Port)
                return Instance;
@@ -353,5 +353,17 @@ namespace OpenSim.Framework.Servers
                return m_Servers[port];
            }
        }
+        public static void Stop()
+        {
+            lock (m_Servers)
+            {
+                foreach (BaseHttpServer httpServer in m_Servers.Values)
+                {
+                    httpServer.Stop();
+                }
+            }
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs b/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs
index 792c62e..4469e7c 100644
--- a/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/Servers/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("OpenSim.Framework.Servers")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-// Setting ComVisible to false makes the types in this assembly not visible 
+// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from 
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 07a09e6..3c2dce8 100644
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -56,7 +56,8 @@ namespace OpenSim.Framework.Servers
        protected ICommandConsole m_console;
        protected OpenSimAppender m_consoleAppender;
-        protected FileAppender m_logFileAppender; 
+        protected FileAppender m_logFileAppender;
+        protected FileAppender m_statsLogFileAppender;
        protected DateTime m_startuptime;
        protected string m_startupDirectory = Environment.CurrentDirectory;
@@ -81,7 +82,7 @@ namespace OpenSim.Framework.Servers
        {
            if (File.Exists(path))
                m_log.ErrorFormat(
-                    "[SERVER BASE]: Previous pid file {0} still exists on startup.  Possibly previously unclean shutdown.", 
+                    "[SERVER BASE]: Previous pid file {0} still exists on startup.  Possibly previously unclean shutdown.",
                    path);
            try
@@ -103,7 +104,7 @@ namespace OpenSim.Framework.Servers
                m_log.Warn(string.Format("[SERVER BASE]: Could not create PID file at {0} ", path), e);
            }
        }
-           
        protected void RemovePIDFile()
        {
            if (m_pidFile != String.Empty)
@@ -156,6 +157,10 @@ namespace OpenSim.Framework.Servers
                {
                    m_logFileAppender = (FileAppender)appender;
                }
+                else if (appender.Name == "StatsLogFileAppender")
+                {
+                    m_statsLogFileAppender = (FileAppender)appender;
+                }
            }
            if (null == m_consoleAppender)
@@ -166,11 +171,11 @@ namespace OpenSim.Framework.Servers
            {
                // FIXME: This should be done through an interface rather than casting.
                m_consoleAppender.Console = (ConsoleBase)m_console;
-                
                // If there is no threshold set then the threshold is effectively everything.
                if (null == m_consoleAppender.Threshold)
                    m_consoleAppender.Threshold = Level.All;
-                
                Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
            }
@@ -185,6 +190,18 @@ namespace OpenSim.Framework.Servers
                m_log.InfoFormat("[SERVER BASE]: Logging started to file {0}", m_logFileAppender.File);
            }
+            if (m_statsLogFileAppender != null && startupConfig != null)
+            {
+                string cfgStatsFileName = startupConfig.GetString("StatsLogFile", null);
+                if (cfgStatsFileName != null)
+                {
+                    m_statsLogFileAppender.File = cfgStatsFileName;
+                    m_statsLogFileAppender.ActivateOptions();
+                }
+                m_log.InfoFormat("[SERVER BASE]: Stats Logging started to file {0}", m_statsLogFileAppender.File);
+            }
        }
        /// <summary>
@@ -205,11 +222,11 @@ namespace OpenSim.Framework.Servers
                "General", false, "show uptime", "show uptime", "Show server uptime", HandleShow);
            m_console.Commands.AddCommand(
-                "General", false, "get log level", "get log level", "Get the current console logging level", 
+                "General", false, "get log level", "get log level", "Get the current console logging level",
                (mod, cmd) => ShowLogLevel());
            m_console.Commands.AddCommand(
-                "General", false, "set log level", "set log level <level>", 
+                "General", false, "set log level", "set log level <level>",
                "Set the console logging level for this session.", HandleSetLogLevel);
            m_console.Commands.AddCommand(
@@ -222,14 +239,14 @@ namespace OpenSim.Framework.Servers
                "config get [<section>] [<key>]",
                "Synonym for config show",
                HandleConfig);
-            
            m_console.Commands.AddCommand(
                "General", false, "config show",
                "config show [<section>] [<key>]",
-                "Show config information", 
+                "Show config information",
                "If neither section nor field are specified, then the whole current configuration is printed." + Environment.NewLine
                + "If a section is given but not a field, then all fields in that section are printed.",
-                HandleConfig);            
+                HandleConfig);
            m_console.Commands.AddCommand(
                "General", false, "config save",
@@ -258,18 +275,6 @@ namespace OpenSim.Framework.Servers
                (string module, string[] args) => Notice(GetThreadsReport()));
            m_console.Commands.AddCommand (
-                "Debug", false, "debug comms set",
-                "debug comms set serialosdreq true|false",
-                "Set comms parameters.  For debug purposes.",
-                HandleDebugCommsSet);
-            m_console.Commands.AddCommand (
-                "Debug", false, "debug comms status",
-                "debug comms status",
-                "Show current debug comms parameters.",
-                HandleDebugCommsStatus);
-            m_console.Commands.AddCommand (
                "Debug", false, "debug threadpool set",
                "debug threadpool set worker|iocp min|max <n>",
                "Set threadpool parameters.  For debug purposes.",
@@ -280,7 +285,7 @@ namespace OpenSim.Framework.Servers
                "debug threadpool status",
                "Show current debug threadpool parameters.",
                HandleDebugThreadpoolStatus);
-            
            m_console.Commands.AddCommand(
                "Debug", false, "debug threadpool level",
                "debug threadpool level 0.." + Util.MAX_THREADPOOL_LEVEL,
@@ -326,47 +331,13 @@ namespace OpenSim.Framework.Servers
        public void RegisterCommonComponents(IConfigSource configSource)
        {
-            IConfig networkConfig = configSource.Configs["Network"];
+//            IConfig networkConfig = configSource.Configs["Network"];
-            if (networkConfig != null)
-            {
-                WebUtil.SerializeOSDRequestsPerEndpoint = networkConfig.GetBoolean("SerializeOSDRequests", false);
-            }
-    
            m_serverStatsCollector = new ServerStatsCollector();
            m_serverStatsCollector.Initialise(configSource);
            m_serverStatsCollector.Start();
        }
-        private void HandleDebugCommsStatus(string module, string[] args)
-        {
-            Notice("serialosdreq is {0}", WebUtil.SerializeOSDRequestsPerEndpoint);
-        }
-        private void HandleDebugCommsSet(string module, string[] args)
-        {
-            if (args.Length != 5)
-            {
-                Notice("Usage: debug comms set serialosdreq true|false");
-                return;
-            }
-            if (args[3] != "serialosdreq")
-            {
-                Notice("Usage: debug comms set serialosdreq true|false");
-                return;
-            }
-            bool setSerializeOsdRequests;
-            if (!ConsoleUtil.TryParseConsoleBool(m_console, args[4], out setSerializeOsdRequests))
-                return;
-            WebUtil.SerializeOSDRequestsPerEndpoint = setSerializeOsdRequests;
-            Notice("serialosdreq is now {0}", setSerializeOsdRequests);
-        }
        private void HandleShowThreadpoolCallsActive(string module, string[] args)
        {
            List<KeyValuePair<string, int>> calls = Util.GetFireAndForgetCallsInProgress().ToList();
@@ -432,7 +403,7 @@ namespace OpenSim.Framework.Servers
            ThreadPool.GetAvailableThreads(out workerThreads, out iocpThreads);
            Notice("Available worker threads: {0}", workerThreads);
-            Notice("Available IOCP threads:   {0}", iocpThreads);           
+            Notice("Available IOCP threads:   {0}", iocpThreads);
        }
        private void HandleDebugThreadpoolSet(string module, string[] args)
@@ -488,7 +459,7 @@ namespace OpenSim.Framework.Servers
                        fail = true;
                }
            }
-             
            if (fail)
            {
                Notice("ERROR: Could not set {0} {1} threads to {2}", poolType, bound, newThreads);
@@ -582,7 +553,7 @@ namespace OpenSim.Framework.Servers
            if (cmdparams.Length > 0)
            {
                string firstParam = cmdparams[0].ToLower();
-                
                switch (firstParam)
                {
                    case "set":
@@ -633,12 +604,12 @@ namespace OpenSim.Framework.Servers
                                {
                                    Notice("[{0}]", config.Name);
                                    foreach (string key in config.GetKeys())
-                                        Notice("  {0} = {1}", key, config.GetString(key));                                
+                                        Notice("  {0} = {1}", key, config.GetString(key));
                                }
                                else
                                {
                                    Notice(
-                                        "config get {0} {1} : {2}", 
+                                        "config get {0} {1} : {2}",
                                        cmdparams[1], cmdparams[2], config.GetString(cmdparams[2]));
                                }
                            }
@@ -692,10 +663,10 @@ namespace OpenSim.Framework.Servers
            }
            string rawLevel = cmd[3];
-            
            ILoggerRepository repository = LogManager.GetRepository();
            Level consoleLevel = repository.LevelMap[rawLevel];
-            
            if (consoleLevel != null)
                m_consoleAppender.Threshold = consoleLevel;
            else
@@ -770,9 +741,9 @@ namespace OpenSim.Framework.Servers
        protected void ShowInfo()
        {
            Notice(GetVersionText());
-            Notice("Startup directory: " + m_startupDirectory);                
+            Notice("Startup directory: " + m_startupDirectory);
            if (null != m_consoleAppender)
-                Notice(String.Format("Console log level: {0}", m_consoleAppender.Threshold));              
+                Notice(String.Format("Console log level: {0}", m_consoleAppender.Threshold));
        }
        /// <summary>
@@ -842,7 +813,7 @@ namespace OpenSim.Framework.Servers
                {
                    StreamReader RevisionFile = File.OpenText(svnRevisionFileName);
                    buildVersion = RevisionFile.ReadLine();
-                    buildVersion.Trim();
+                    buildVersion = buildVersion.Trim();
                    RevisionFile.Close();
                }
@@ -871,9 +842,9 @@ namespace OpenSim.Framework.Servers
            }
        }
-        protected string GetVersionText()
+        public string GetVersionText()
        {
-            return String.Format("Version: {0} (SIMULATION/{1} - SIMULATION/{2})", 
+            return String.Format("Version: {0} (SIMULATION/{1} - SIMULATION/{2})",
                m_version, VersionInfo.SimulationServiceVersionSupportedMin, VersionInfo.SimulationServiceVersionSupportedMax);
        }
@@ -898,7 +869,7 @@ namespace OpenSim.Framework.Servers
            foreach (Watchdog.ThreadWatchdogInfo twi in threads)
            {
                Thread t = twi.Thread;
-                
                sb.AppendFormat(
                    reportFormat,
                    t.ManagedThreadId,
@@ -911,16 +882,12 @@ namespace OpenSim.Framework.Servers
                sb.Append("\n");
            }
-            sb.Append("\n");
+            sb.Append(GetThreadPoolReport());
-            // For some reason mono 2.6.7 returns an empty threads set!  Not going to confuse people by reporting
+            sb.Append("\n");
-            // zero active threads.
            int totalThreads = Process.GetCurrentProcess().Threads.Count;
            if (totalThreads > 0)
-                sb.AppendFormat("Total threads active: {0}\n\n", totalThreads);
+                sb.AppendFormat("Total process threads active: {0}\n\n", totalThreads);
-            sb.Append("Main threadpool (excluding script engine pools)\n");
-            sb.Append(GetThreadPoolReport());
            return sb.ToString();
        }
@@ -931,15 +898,46 @@ namespace OpenSim.Framework.Servers
        /// <returns></returns>
        public static string GetThreadPoolReport()
        {
+            StringBuilder sb = new StringBuilder();
+            // framework pool is alwasy active
+            int maxWorkers;
+            int minWorkers;
+            int curWorkers;
+            int maxComp;
+            int minComp;
+            int curComp;
+            try
+            {
+                ThreadPool.GetMaxThreads(out maxWorkers, out maxComp);
+                ThreadPool.GetMinThreads(out minWorkers, out minComp);
+                ThreadPool.GetAvailableThreads(out curWorkers, out curComp);
+                curWorkers = maxWorkers - curWorkers;
+                curComp = maxComp - curComp;
+                sb.Append("\nFramework main threadpool \n");
+                sb.AppendFormat("workers:    {0} ({1} / {2})\n", curWorkers, maxWorkers, minWorkers);
+                sb.AppendFormat("Completion: {0} ({1} / {2})\n", curComp, maxComp, minComp);
+            }
+            catch { }
+            if (
+                Util.FireAndForgetMethod == FireAndForgetMethod.QueueUserWorkItem
+                    || Util.FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem)
+            {
+                sb.AppendFormat("\nThread pool used: Framework main threadpool\n");
+                return sb.ToString();
+            }
            string threadPoolUsed = null;
            int maxThreads = 0;
            int minThreads = 0;
            int allocatedThreads = 0;
            int inUseThreads = 0;
            int waitingCallbacks = 0;
-            int completionPortThreads = 0;
-            StringBuilder sb = new StringBuilder();
            if (Util.FireAndForgetMethod == FireAndForgetMethod.SmartThreadPool)
            {
                STPInfo stpi = Util.GetSmartThreadPoolInfo();
@@ -955,22 +953,10 @@ namespace OpenSim.Framework.Servers
                    waitingCallbacks = stpi.WaitingCallbacks;
                }
            }
-            else if (
+ 
-                Util.FireAndForgetMethod == FireAndForgetMethod.QueueUserWorkItem
-                    || Util.FireAndForgetMethod == FireAndForgetMethod.UnsafeQueueUserWorkItem)
-            {
-                threadPoolUsed = "BuiltInThreadPool";
-                ThreadPool.GetMaxThreads(out maxThreads, out completionPortThreads);
-                ThreadPool.GetMinThreads(out minThreads, out completionPortThreads);
-                int availableThreads;
-                ThreadPool.GetAvailableThreads(out availableThreads, out completionPortThreads);
-                inUseThreads = maxThreads - availableThreads;
-                allocatedThreads = -1;
-                waitingCallbacks = -1;
-            }
            if (threadPoolUsed != null)
            {
+                sb.Append("\nThreadpool (excluding script engine pools)\n");
                sb.AppendFormat("Thread pool used           : {0}\n", threadPoolUsed);
                sb.AppendFormat("Max threads                : {0}\n", maxThreads);
                sb.AppendFormat("Min threads                : {0}\n", minThreads);
@@ -1005,7 +991,7 @@ namespace OpenSim.Framework.Servers
                MainConsole.Instance.OutputFormat("Aborted thread with id {0}", threadId);
            else
                MainConsole.Instance.OutputFormat("ERROR - Thread with id {0} not found in managed threads", threadId);
-        } 
+        }
        /// <summary>
        /// Console output is only possible if a console has been established.
@@ -1020,13 +1006,13 @@ namespace OpenSim.Framework.Servers
                m_console.Output(msg);
            }
        }
-        
        /// <summary>
        /// Console output is only possible if a console has been established.
        /// That is something that cannot be determined within this class. So
        /// all attempts to use the console MUST be verified.
        /// </summary>
-        /// <param name="format"></param>        
+        /// <param name="format"></param>
        /// <param name="components"></param>
        protected void Notice(string format, params object[] components)
        {
diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
index 5c0e0df..e5f7043 100644
--- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
+++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs
@@ -39,9 +39,331 @@ using OpenSim.Tests.Common;
 namespace OpenSim.Framework.Servers.Tests
 {
+/*
    [TestFixture]
    public class OSHttpTests : OpenSimTestCase
-    {       
+    {
+        // we need an IHttpClientContext for our tests
+        public class TestHttpClientContext: IHttpClientContext
+        {
+            private bool _secured;
+            public bool IsSecured
+            {
+                get { return _secured; }
+            }
+            public bool Secured
+            {
+                get { return _secured; }
+            }
+            public TestHttpClientContext(bool secured)
+            {
+                _secured = secured;
+            }
+            public void Disconnect(SocketError error) {}
+            public void Respond(string httpVersion, HttpStatusCode statusCode, string reason, string body) {}
+            public void Respond(string httpVersion, HttpStatusCode statusCode, string reason) {}
+            public void Respond(string body) {}
+            public void Send(byte[] buffer) {}
+            public void Send(byte[] buffer, int offset, int size) {}
+            public void Respond(string httpVersion, HttpStatusCode statusCode, string reason, string body, string contentType) {}
+            public void Close() { }
+            public bool EndWhenDone { get { return false;} set { return;}}
+            public HTTPNetworkContext GiveMeTheNetworkStreamIKnowWhatImDoing()
+            {
+                return new HTTPNetworkContext();
+            }
+            public event EventHandler<DisconnectedEventArgs> Disconnected = delegate { };
+            /// <summary>
+            /// A request have been received in the context.
+            /// </summary>
+            public event EventHandler<RequestEventArgs> RequestReceived = delegate { };
+            public bool CanSend { get { return true; } }
+            public string RemoteEndPoint { get { return ""; } }
+            public string RemoteEndPointAddress { get { return ""; } }
+            public string RemoteEndPointPort { get { return ""; } }
+        }
+        public class TestHttpRequest: IHttpRequest
+        {
+            private string _uriPath;
+            public bool BodyIsComplete
+            {
+                get { return true; }
+            }
+            public string[] AcceptTypes
+            {
+                get {return _acceptTypes; }
+            }
+            private string[] _acceptTypes;
+            public Stream Body
+            {
+                get { return _body; }
+                set { _body = value;}
+            }
+            private Stream _body;
+            public ConnectionType Connection
+            {
+                get { return _connection; }
+                set { _connection = value; }
+            }
+            private ConnectionType _connection;
+            public int ContentLength
+            {
+                get { return _contentLength; }
+                set { _contentLength = value; }
+            }
+            private int _contentLength;
+            public NameValueCollection Headers
+            {
+                get { return _headers; }
+            }
+            private NameValueCollection _headers = new NameValueCollection();
+            public string HttpVersion
+            {
+                get { return _httpVersion; }
+                set { _httpVersion = value; }
+            }
+            private string _httpVersion = null;
+            public string Method
+            {
+                get { return _method; }
+                set { _method = value; }
+            }
+            private string _method = null;
+            public HttpInput QueryString
+            {
+                get { return _queryString;  }
+            }
+            private HttpInput _queryString = null;
+            public Uri Uri
+            {
+                get { return _uri; }
+                set { _uri = value; }
+            }
+            private Uri _uri = null;
+            public string[] UriParts
+            {
+                get { return _uri.Segments; }
+            }
+            public HttpParam Param
+            {
+                get { return null; }
+            }
+            public HttpForm Form
+            {
+                get { return null; }
+            }
+            public bool IsAjax
+            {
+                get { return false; }
+            }
+            public RequestCookies Cookies
+            {
+                get { return null; }
+            }
+            public TestHttpRequest() {}
+            public TestHttpRequest(string contentEncoding, string contentType, string userAgent,
+                                   string remoteAddr, string remotePort, string[] acceptTypes,
+                                   ConnectionType connectionType, int contentLength, Uri uri)
+            {
+                _headers["content-encoding"] = contentEncoding;
+                _headers["content-type"] = contentType;
+                _headers["user-agent"] = userAgent;
+                _headers["remote_addr"] = remoteAddr;
+                _headers["remote_port"] = remotePort;
+                _acceptTypes = acceptTypes;
+                _connection = connectionType;
+                _contentLength = contentLength;
+                _uri = uri;
+            }
+            public void DecodeBody(FormDecoderProvider providers) {}
+            public void SetCookies(RequestCookies cookies) {}
+            public void AddHeader(string name, string value)
+            {
+                _headers.Add(name, value);
+            }
+            public int AddToBody(byte[] bytes, int offset, int length)
+            {
+                return 0;
+            }
+            public void Clear() {}
+            public object Clone()
+            {
+                TestHttpRequest clone = new TestHttpRequest();
+                clone._acceptTypes = _acceptTypes;
+                clone._connection = _connection;
+                clone._contentLength = _contentLength;
+                clone._uri = _uri;
+                clone._headers = new NameValueCollection(_headers);
+                return clone;
+            }
+            public IHttpResponse CreateResponse(IHttpClientContext context)
+            {
+                return new HttpResponse(context, this);
+            }
+            /// <summary>
+            /// Path and query (will be merged with the host header) and put in Uri
+            /// </summary>
+            /// <see cref="Uri"/>
+            public string UriPath
+            {
+                get { return _uriPath; }
+                set
+                {
+                    _uriPath = value;
+                }
+            }
+        }
+        public class TestHttpResponse: IHttpResponse
+        {
+            public Stream Body
+            {
+                get { return _body; }
+                set { _body = value; }
+            }
+            private Stream _body;
+            public string ProtocolVersion
+            {
+                get { return _protocolVersion; }
+                set { _protocolVersion = value; }
+            }
+            private string _protocolVersion;
+            public bool Chunked
+            {
+                get { return _chunked; }
+                set { _chunked = value; }
+            }
+            private bool _chunked;
+            public ConnectionType Connection
+            {
+                get { return _connection; }
+                set { _connection = value; }
+            }
+            private ConnectionType _connection;
+            public Encoding Encoding
+            {
+                get { return _encoding; }
+                set { _encoding = value; }
+            }
+            private Encoding _encoding;
+            public int KeepAlive
+            {
+                get { return _keepAlive; }
+                set { _keepAlive = value; }
+            }
+            private int _keepAlive;
+            public HttpStatusCode Status
+            {
+                get { return _status; }
+                set { _status = value; }
+            }
+            private HttpStatusCode _status;
+            public string Reason
+            {
+                get { return _reason; }
+                set { _reason = value; }
+            }
+            private string _reason;
+            public long ContentLength
+            {
+                get { return _contentLength; }
+                set { _contentLength = value; }
+            }
+            private long _contentLength;
+            public string ContentType
+            {
+                get { return _contentType; }
+                set { _contentType = value; }
+            }
+            private string _contentType;
+            public bool HeadersSent
+            {
+                get { return _headersSent; }
+            }
+            private bool _headersSent;
+            public bool Sent
+            {
+                get { return _sent; }
+            }
+            private bool _sent;
+            public ResponseCookies Cookies
+            {
+                get { return _cookies; }
+            }
+            private ResponseCookies _cookies = null;
+            public TestHttpResponse()
+            {
+                _headersSent = false;
+                _sent = false;
+            }
+            public void AddHeader(string name, string value) {}
+            public void Send()
+            {
+                if (!_headersSent) SendHeaders();
+                if (_sent) throw new InvalidOperationException("stuff already sent");
+                _sent = true;
+            }
+            public void SendBody(byte[] buffer, int offset, int count)
+            {
+                if (!_headersSent) SendHeaders();
+                _sent = true;
+            }
+            public void SendBody(byte[] buffer)
+            {
+                if (!_headersSent) SendHeaders();
+                _sent = true;
+            }
+            public void SendHeaders()
+            {
+                if (_headersSent) throw new InvalidOperationException("headers already sent");
+                _headersSent = true;
+            }
+            public void Redirect(Uri uri) {}
+            public void Redirect(string url) {}
+        }
        public OSHttpRequest req0;
        public OSHttpRequest req1;
@@ -52,22 +374,22 @@ namespace OpenSim.Framework.Servers.Tests
        [TestFixtureSetUp]
        public void Init()
        {
-            TestHttpRequest threq0 = new TestHttpRequest("utf-8", "text/xml", "OpenSim Test Agent", "192.168.0.1", "4711", 
+            TestHttpRequest threq0 = new TestHttpRequest("utf-8", "text/xml", "OpenSim Test Agent", "192.168.0.1", "4711",
-                                                       new string[] {"text/xml"}, 
+                                                       new string[] {"text/xml"},
-                                                       ConnectionType.KeepAlive, 4711, 
+                                                       ConnectionType.KeepAlive, 4711,
                                                       new Uri("http://127.0.0.1/admin/inventory/Dr+Who/Tardis"));
            threq0.Method = "GET";
            threq0.HttpVersion = HttpHelper.HTTP10;
-            TestHttpRequest threq1 = new TestHttpRequest("utf-8", "text/xml", "OpenSim Test Agent", "192.168.0.1", "4711", 
+            TestHttpRequest threq1 = new TestHttpRequest("utf-8", "text/xml", "OpenSim Test Agent", "192.168.0.1", "4711",
-                                                       new string[] {"text/xml"}, 
+                                                       new string[] {"text/xml"},
-                                                       ConnectionType.KeepAlive, 4711, 
+                                                       ConnectionType.KeepAlive, 4711,
                                                       new Uri("http://127.0.0.1/admin/inventory/Dr+Who/Tardis?a=0&b=1&c=2"));
            threq1.Method = "POST";
            threq1.HttpVersion = HttpHelper.HTTP11;
            threq1.Headers["x-wuff"] = "wuffwuff";
            threq1.Headers["www-authenticate"] = "go away";
-            
            req0 = new OSHttpRequest(new TestHttpClientContext(false), threq0);
            req1 = new OSHttpRequest(new TestHttpClientContext(false), threq1);
@@ -113,4 +435,5 @@ namespace OpenSim.Framework.Servers.Tests
            Assert.That(rsp0.ContentType, Is.EqualTo("text/xml"));
        }
    }
-}
-\ No newline at end of file
+*/
+}
diff --git a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
index 2d72cb8..480f2bb 100644
--- a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
+++ b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Servers.Tests
        {
            foreach (VersionInfo.Flavour flavour in Enum.GetValues(typeof(VersionInfo.Flavour)))
            {
-                Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.GetVersionString("0.0.0", "0", flavour).Length, "0.0.0/" + flavour + " failed");
+                Assert.AreEqual(VersionInfo.VERSIONINFO_VERSION_LENGTH, VersionInfo.GetVersionString("0.0.0", flavour).Length, "0.0.0/" + flavour + " failed");
            }
        }
    }
diff --git a/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs b/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs
index 512ac4f..9126cfb 100644
--- a/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs
+++ b/OpenSim/Framework/ServiceAuth/BasicHttpAuthentication.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.ServiceAuth
        {
 //            remove_me = section;
            m_Username = Util.GetConfigVarFromSections<string>(config, "HttpAuthUsername", new string[] { "Network", section }, string.Empty);
-            m_Password = Util.GetConfigVarFromSections<string>(config, "HttpAuthPassword", new string[] { "Network", section }, string.Empty); 
+            m_Password = Util.GetConfigVarFromSections<string>(config, "HttpAuthPassword", new string[] { "Network", section }, string.Empty);
            string str = m_Username + ":" + m_Password;
            byte[] encData_byte = Util.UTF8.GetBytes(str);
diff --git a/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs b/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs
index a49952c..79d6ff4 100644
--- a/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs
+++ b/OpenSim/Framework/ServiceAuth/CompoundAuthentication.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.ServiceAuth
            m_authentications.Remove(auth);
        }
-        public void AddAuthorization(NameValueCollection headers) 
+        public void AddAuthorization(NameValueCollection headers)
        {
            foreach (IServiceAuth auth in m_authentications)
                auth.AddAuthorization(headers);
diff --git a/OpenSim/Framework/SimStats.cs b/OpenSim/Framework/SimStats.cs
index 3d8f32f..f19a270 100644
--- a/OpenSim/Framework/SimStats.cs
+++ b/OpenSim/Framework/SimStats.cs
@@ -32,7 +32,7 @@ namespace OpenSim.Framework
 {
    /// <summary>
    /// Enapsulate statistics for a simulator/scene.
-    /// 
+    ///
    /// TODO: This looks very much like the OpenMetaverse SimStatsPacket.  It should be much more generic stats
    /// storage.
    /// </summary>
@@ -49,25 +49,31 @@ namespace OpenSim.Framework
            get { return m_regionY; }
        }
        private uint m_regionY;
-        
        public SimStatsPacket.RegionBlock RegionBlock
        {
            get { return m_regionBlock; }
        }
        private SimStatsPacket.RegionBlock m_regionBlock;
-        
        public SimStatsPacket.StatBlock[] StatsBlock
        {
            get { return m_statsBlock; }
        }
        private SimStatsPacket.StatBlock[] m_statsBlock;
-        
+        public SimStatsPacket.StatBlock[] ExtraStatsBlock
+        {
+            get { return m_extraStatsBlock; }
+        }
+        private SimStatsPacket.StatBlock[] m_extraStatsBlock;
        public uint RegionFlags
        {
            get { return m_regionFlags; }
        }
        private uint m_regionFlags;
-            
        public uint ObjectCapacity
        {
            get { return m_objectCapacity; }
@@ -79,10 +85,11 @@ namespace OpenSim.Framework
            get { return regionUUID; }
        }
        private UUID regionUUID;
-                
        public SimStats(
-            uint regionX, uint regionY, uint regionFlags, uint objectCapacity, 
+            uint regionX, uint regionY, uint regionFlags, uint objectCapacity,
-            SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock, UUID pRUUID)
+            SimStatsPacket.RegionBlock regionBlock, SimStatsPacket.StatBlock[] statsBlock,
+            SimStatsPacket.StatBlock[] ExtraStatsBlock, UUID pRUUID)
        {
            regionUUID = pRUUID;
            m_regionX = regionX;
@@ -91,6 +98,7 @@ namespace OpenSim.Framework
            m_objectCapacity = objectCapacity;
            m_regionBlock = regionBlock;
            m_statsBlock = statsBlock;
+            m_extraStatsBlock = ExtraStatsBlock;
        }
    }
 }
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 8af2c41..223d91f 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -27,9 +27,13 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
+using System.Reflection;
 using System.Xml;
+using System.Diagnostics;
 using System.Xml.Schema;
 using System.Xml.Serialization;
+using log4net;
 using OpenMetaverse;
 namespace OpenSim.Framework
@@ -47,6 +51,187 @@ namespace OpenSim.Framework
        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem));
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private Thread LockedByThread;
+//        private string WriterStack;
+//        private Dictionary<Thread, string> ReadLockers =
+//                new Dictionary<Thread, string>();
+        /// <value>
+        /// An advanced lock for inventory data
+        /// </value>
+        private volatile System.Threading.ReaderWriterLockSlim m_itemLock = new System.Threading.ReaderWriterLockSlim();
+        ~TaskInventoryDictionary()
+        {
+            m_itemLock.Dispose();
+            m_itemLock = null;
+        }
+        /// <summary>
+        /// Are we readlocked by the calling thread?
+        /// </summary>
+        public bool IsReadLockedByMe()
+        {
+            if (m_itemLock.RecursiveReadCount > 0)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        /// <summary>
+        /// Lock our inventory list for reading (many can read, one can write)
+        /// </summary>
+        public void LockItemsForRead(bool locked)
+        {
+            if (locked)
+            {
+                if (m_itemLock.IsWriteLockHeld && LockedByThread != null)
+                {
+                    if (!LockedByThread.IsAlive)
+                    {
+                        //Locked by dead thread, reset.
+                        m_itemLock = new System.Threading.ReaderWriterLockSlim();
+                    }
+                }
+                if (m_itemLock.RecursiveReadCount > 0)
+                {
+                    m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
+                    try
+                    {
+                        // That call stack is useful for end users only. RealProgrammers need a full dump. Commented.
+                        // StackTrace stackTrace = new StackTrace();           // get call stack
+                        // StackFrame[] stackFrames = stackTrace.GetFrames();  // get method calls (frames)
+                        //
+                        // // write call stack method names
+                        // foreach (StackFrame stackFrame in stackFrames)
+                        // {
+                        //     m_log.Error("[SceneObjectGroup.m_parts]  "+(stackFrame.GetMethod().Name));   // write method name
+                        // }
+                        // The below is far more useful
+//                        System.Console.WriteLine("------------------------------------------");
+//                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
+//                        System.Console.WriteLine("------------------------------------------");
+//                        foreach (KeyValuePair<Thread, string> kvp in ReadLockers)
+//                        {
+//                            System.Console.WriteLine("Locker name {0} call stack:\n" + kvp.Value, kvp.Key.Name);
+//                            System.Console.WriteLine("------------------------------------------");
+//                        }
+                    }
+                    catch
+                    {}
+                    m_itemLock.ExitReadLock();
+                }
+                if (m_itemLock.RecursiveWriteCount > 0)
+                {
+                    m_log.Error("[TaskInventoryDictionary] Recursive write lock requested. This should not happen and means something needs to be fixed.");
+//                    try
+//                    {
+//                        System.Console.WriteLine("------------------------------------------");
+//                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
+//                        System.Console.WriteLine("------------------------------------------");
+//                        System.Console.WriteLine("Locker's call stack:\n" + WriterStack);
+//                        System.Console.WriteLine("------------------------------------------");
+//                    }
+//                    catch
+//                    {}
+                    m_itemLock.ExitWriteLock();
+                }
+                while (!m_itemLock.TryEnterReadLock(60000))
+                {
+                    m_log.Error("Thread lock detected while trying to aquire READ lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
+                    //if (m_itemLock.IsWriteLockHeld)
+                    //{
+                        m_itemLock = new System.Threading.ReaderWriterLockSlim();
+//                        System.Console.WriteLine("------------------------------------------");
+//                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
+//                        System.Console.WriteLine("------------------------------------------");
+//                        System.Console.WriteLine("Locker's call stack:\n" + WriterStack);
+//                        System.Console.WriteLine("------------------------------------------");
+//                        LockedByThread = null;
+//                        ReadLockers.Clear();
+                    //}
+                }
+//                ReadLockers[Thread.CurrentThread] = Environment.StackTrace;
+            }
+            else
+            {
+                if (m_itemLock.RecursiveReadCount>0)
+                {
+                    m_itemLock.ExitReadLock();
+                }
+//                if (m_itemLock.RecursiveReadCount == 0)
+//                    ReadLockers.Remove(Thread.CurrentThread);
+            }
+        }
+        /// <summary>
+        /// Lock our inventory list for writing (many can read, one can write)
+        /// </summary>
+        public void LockItemsForWrite(bool locked)
+        {
+            if (locked)
+            {
+                //Enter a write lock, wait indefinately for one to open.
+                if (m_itemLock.RecursiveReadCount > 0)
+                {
+                    m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
+                    m_itemLock.ExitReadLock();
+                }
+                if (m_itemLock.RecursiveWriteCount > 0)
+                {
+                    m_log.Error("[TaskInventoryDictionary] Recursive write lock requested. This should not happen and means something needs to be fixed.");
+                    m_itemLock.ExitWriteLock();
+                }
+                while (!m_itemLock.TryEnterWriteLock(60000))
+                {
+                    if (m_itemLock.IsWriteLockHeld)
+                    {
+                        m_log.Error("Thread lock detected while trying to aquire WRITE lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
+//                        System.Console.WriteLine("------------------------------------------");
+//                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
+//                        System.Console.WriteLine("------------------------------------------");
+//                        System.Console.WriteLine("Locker's call stack:\n" + WriterStack);
+//                        System.Console.WriteLine("------------------------------------------");
+                    }
+                    else
+                    {
+                        m_log.Error("Thread lock detected while trying to aquire WRITE lock in TaskInventoryDictionary. Locked by a reader. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
+//                        System.Console.WriteLine("------------------------------------------");
+//                        System.Console.WriteLine("My call stack:\n" + Environment.StackTrace);
+//                        System.Console.WriteLine("------------------------------------------");
+//                        foreach (KeyValuePair<Thread, string> kvp in ReadLockers)
+//                        {
+//                            System.Console.WriteLine("Locker name {0} call stack:\n" + kvp.Value, kvp.Key.Name);
+//                            System.Console.WriteLine("------------------------------------------");
+//                        }
+                    }
+                    m_itemLock = new System.Threading.ReaderWriterLockSlim();
+//                    ReadLockers.Clear();
+                }
+                LockedByThread = Thread.CurrentThread;
+//                WriterStack = Environment.StackTrace;
+            }
+            else
+            {
+                if (m_itemLock.RecursiveWriteCount > 0)
+                {
+                    m_itemLock.ExitWriteLock();
+                }
+            }
+        }
        #region ICloneable Members
@@ -54,14 +239,13 @@ namespace OpenSim.Framework
        {
            TaskInventoryDictionary clone = new TaskInventoryDictionary();
-            lock (this)
+            m_itemLock.EnterReadLock();
+            foreach (UUID uuid in Keys)
            {
-                foreach (UUID uuid in Keys)
+                clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
-                {
-                    clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
-                }
            }
-            
+            m_itemLock.ExitReadLock();
            return clone;
        }
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 307cb75..1cc32b3 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Framework
        private int _invType = 0;
        private UUID _itemID = UUID.Zero;
        private UUID _lastOwnerID = UUID.Zero;
+        private UUID _rezzerID = UUID.Zero;
        private string _name = String.Empty;
        private uint _nextOwnerMask = FULL_MASK_PERMISSIONS_GENERAL;
        private UUID _ownerID = UUID.Zero;
@@ -254,6 +255,16 @@ namespace OpenSim.Framework
            }
        }
+        public UUID RezzerID
+        {
+            get {
+                return _rezzerID;
+            }
+            set {
+                _rezzerID = value;
+            }
+        }
        public string Name {
            get {
                return _name;
diff --git a/OpenSim/Framework/TerrainData.cs b/OpenSim/Framework/TerrainData.cs
index 6b1be4e..5cec2b5 100644
--- a/OpenSim/Framework/TerrainData.cs
+++ b/OpenSim/Framework/TerrainData.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.IO.Compression;
 using System.Reflection;
 using OpenMetaverse;
@@ -48,6 +49,7 @@ namespace OpenSim.Framework
        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);
@@ -72,8 +74,8 @@ namespace OpenSim.Framework
            return new HeightmapTerrainData(pSizeX, pSizeY, pSizeZ, pFormatCode, pBlob);
        }
-        // return a special compressed representation of the heightmap in ints
+        // return a special compressed representation of the heightmap in ushort
-        public abstract int[] GetCompressedMap();
+        public abstract float[] GetCompressedMap();
        public abstract float CompressionFactor { get; }
        public abstract float[] GetFloatsSerialized();
@@ -94,14 +96,18 @@ namespace OpenSim.Framework
    {
        // Terrain is 'double[256,256]'
        Legacy256 = 11,
        // Terrain is 'int32, int32, float[,]' where the ints are X and Y dimensions
        // The dimensions are presumed to be multiples of 16 and, more likely, multiples of 256.
        Variable2D = 22,
+        Variable2DGzip = 23,
        // Terrain is 'int32, int32, int32, int16[]' where the ints are X and Y dimensions
        //   and third int is the 'compression factor'. The heights are compressed as
-        //   "int compressedHeight = (int)(height * compressionFactor);"
+        //   "ushort compressedHeight = (ushort)(height * compressionFactor);"
        // The dimensions are presumed to be multiples of 16 and, more likely, multiples of 256.
        Compressed2D = 27,
        // A revision that is not listed above or any revision greater than this value is 'Legacy256'.
        RevisionHigh = 1234
    }
@@ -109,7 +115,7 @@ namespace OpenSim.Framework
    // Version of terrain that is a heightmap.
    // 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 integers. The integer values are converted to
+    // The heighmap is kept as an array of ushorts. The ushort values are converted to
    //    and from floats by TerrainCompressionFactor.
    public class HeightmapTerrainData : TerrainData
    {
@@ -119,12 +125,12 @@ namespace OpenSim.Framework
        // TerrainData.this[x, y]
        public override float this[int x, int y]
        {
-            get { return FromCompressedHeight(m_heightmap[x, y]); }
+            get { return m_heightmap[x, y]; }
-            set {
+            set
-                int newVal = ToCompressedHeight(value);
+            {
-                if (m_heightmap[x, y] != newVal)
+                if (m_heightmap[x, y] != value)
                {
-                    m_heightmap[x, y] = newVal;
+                    m_heightmap[x, y] = value;
                    m_taint[x / Constants.TerrainPatchSize, y / Constants.TerrainPatchSize] = true;
                }
            }
@@ -164,10 +170,9 @@ namespace OpenSim.Framework
        // TerrainData.ClearLand(float)
        public override void ClearLand(float pHeight)
        {
-            int flatHeight = ToCompressedHeight(pHeight);
            for (int xx = 0; xx < SizeX; xx++)
                for (int yy = 0; yy < SizeY; yy++)
-                    m_heightmap[xx, yy] = flatHeight;
+                    m_heightmap[xx, yy] = pHeight;
        }
        // Return 'true' of the patch that contains these region coordinates has been modified.
@@ -177,13 +182,15 @@ namespace OpenSim.Framework
        {
            int tx = xx / Constants.TerrainPatchSize;
            int ty = yy / Constants.TerrainPatchSize;
-            bool ret =  m_taint[tx, ty];
+            bool ret = m_taint[tx, ty];
            if (ret && clearOnTest)
                m_taint[tx, ty] = false;
            return ret;
        }
        // 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)
        {
            return IsTaintedAt(xx, yy, true /* clearOnTest */);
@@ -194,6 +201,7 @@ namespace OpenSim.Framework
        public override bool GetDatabaseBlob(out int DBRevisionCode, out Array blob)
        {
            bool ret = false;
+/* save all as Variable2DGzip
            if (SizeX == Constants.RegionSize && SizeY == Constants.RegionSize)
            {
                DBRevisionCode = (int)DBTerrainRevision.Legacy256;
@@ -202,10 +210,13 @@ namespace OpenSim.Framework
            }
            else
            {
-                DBRevisionCode = (int)DBTerrainRevision.Compressed2D;
+*/
-                blob = ToCompressedTerrainSerialization();
+                DBRevisionCode = (int)DBTerrainRevision.Variable2DGzip;
+//                DBRevisionCode = (int)DBTerrainRevision.Variable2D;
+                blob = ToCompressedTerrainSerializationV2DGzip();
+//                blob = ToCompressedTerrainSerializationV2D();
                ret = true;
-            }
+//            }
            return ret;
        }
@@ -214,9 +225,9 @@ namespace OpenSim.Framework
        public override float CompressionFactor { get { return m_compressionFactor; } }
        // TerrainData.GetCompressedMap
-        public override int[] GetCompressedMap()
+        public override float[] GetCompressedMap()
        {
-            int[] newMap = new int[SizeX * SizeY];
+            float[] newMap = new float[SizeX * SizeY];
            int ind = 0;
            for (int xx = 0; xx < SizeX; xx++)
@@ -230,7 +241,7 @@ namespace OpenSim.Framework
        public override TerrainData Clone()
        {
            HeightmapTerrainData ret = new HeightmapTerrainData(SizeX, SizeY, SizeZ);
-            ret.m_heightmap = (int[,])this.m_heightmap.Clone();
+            ret.m_heightmap = (float[,])this.m_heightmap.Clone();
            return ret;
        }
@@ -247,7 +258,7 @@ namespace OpenSim.Framework
            for (int jj = 0; jj < SizeY; jj++)
                for (int ii = 0; ii < SizeX; ii++)
                {
-                    heights[idx++] = FromCompressedHeight(m_heightmap[ii, jj]);
+                    heights[idx++] = m_heightmap[ii, jj];
                }
            return heights;
@@ -259,7 +270,7 @@ namespace OpenSim.Framework
            double[,] ret = new double[SizeX, SizeY];
            for (int xx = 0; xx < SizeX; xx++)
                for (int yy = 0; yy < SizeY; yy++)
-                    ret[xx, yy] = FromCompressedHeight(m_heightmap[xx, yy]);
+                    ret[xx, yy] = (double)m_heightmap[xx, yy];
            return ret;
        }
@@ -267,19 +278,40 @@ namespace OpenSim.Framework
        // =============================================================
-        private int[,] m_heightmap;
+        private float[,] m_heightmap;
        // Remember subregions of the heightmap that has changed.
        private bool[,] m_taint;
-        // To save space (especially for large regions), keep the height as a short integer
        //    that is coded as the float height times the compression factor (usually '100'
        //    to make for two decimal points).
-        public int ToCompressedHeight(double pHeight)
+        public short ToCompressedHeightshort(float pHeight)
        {
-            return (int)(pHeight * CompressionFactor);
+            // clamp into valid range
+            pHeight *= CompressionFactor;
+            if (pHeight < short.MinValue)
+                return short.MinValue;
+            else if (pHeight > short.MaxValue)
+                return short.MaxValue;
+            return (short)pHeight;
        }
-        public float FromCompressedHeight(int pHeight)
+        public ushort ToCompressedHeightushort(float pHeight)
+        {
+            // clamp into valid range
+            pHeight *= CompressionFactor;
+            if (pHeight < ushort.MinValue)
+                return ushort.MinValue;
+            else if (pHeight > ushort.MaxValue)
+                return ushort.MaxValue;
+            return (ushort)pHeight;
+        }
+        public float FromCompressedHeight(short pHeight)
+        {
+            return ((float)pHeight) / CompressionFactor;
+        }
+        public float FromCompressedHeight(ushort pHeight)
        {
            return ((float)pHeight) / CompressionFactor;
        }
@@ -293,12 +325,12 @@ namespace OpenSim.Framework
            SizeZ = (int)Constants.RegionHeight;
            m_compressionFactor = 100.0f;
-            m_heightmap = new int[SizeX, SizeY];
+            m_heightmap = new float[SizeX, SizeY];
            for (int ii = 0; ii < SizeX; ii++)
            {
                for (int jj = 0; jj < SizeY; jj++)
                {
-                    m_heightmap[ii, jj] = ToCompressedHeight(pTerrain[ii, jj]);
+                    m_heightmap[ii, jj] = (float)pTerrain[ii, jj];
                }
            }
@@ -315,14 +347,15 @@ namespace OpenSim.Framework
            SizeY = pY;
            SizeZ = pZ;
            m_compressionFactor = 100.0f;
-            m_heightmap = new int[SizeX, SizeY];
+            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);
            ClearTaint();
            ClearLand(0f);
        }
-        public HeightmapTerrainData(int[] cmap, float pCompressionFactor, int pX, int pY, int pZ) : this(pX, pY, pZ)
+        public HeightmapTerrainData(float[] cmap, float pCompressionFactor, int pX, int pY, int pZ)
+            : this(pX, pY, pZ)
        {
            m_compressionFactor = pCompressionFactor;
            int ind = 0;
@@ -333,12 +366,22 @@ namespace OpenSim.Framework
        }
        // Create a heighmap from a database blob
-        public HeightmapTerrainData(int pSizeX, int pSizeY, int pSizeZ, int pFormatCode, byte[] pBlob) : this(pSizeX, pSizeY, pSizeZ)
+        public HeightmapTerrainData(int pSizeX, int pSizeY, int pSizeZ, int pFormatCode, byte[] pBlob)
+            : this(pSizeX, pSizeY, pSizeZ)
        {
            switch ((DBTerrainRevision)pFormatCode)
            {
+                case DBTerrainRevision.Variable2DGzip:
+                    FromCompressedTerrainSerializationV2DGZip(pBlob);
+                    m_log.DebugFormat("{0} HeightmapTerrainData create from Variable2DGzip serialization. Size=<{1},{2}>", LogHeader, SizeX, SizeY);
+                    break;
+                case DBTerrainRevision.Variable2D:
+                    FromCompressedTerrainSerializationV2D(pBlob);
+                    m_log.DebugFormat("{0} HeightmapTerrainData create from Variable2D serialization. Size=<{1},{2}>", LogHeader, SizeX, SizeY);
+                    break;
                case DBTerrainRevision.Compressed2D:
-                    FromCompressedTerrainSerialization(pBlob);
+                    FromCompressedTerrainSerialization2D(pBlob);
                    m_log.DebugFormat("{0} HeightmapTerrainData create from Compressed2D serialization. Size=<{1},{2}>", LogHeader, SizeX, SizeY);
                    break;
                default:
@@ -373,50 +416,116 @@ namespace OpenSim.Framework
            return ret;
        }
-        // Just create an array of doubles. Presumes the caller implicitly knows the size.
+        // Presumes the caller implicitly knows the size.
        public void FromLegacyTerrainSerialization(byte[] pBlob)
        {
            // In case database info doesn't match real terrain size, initialize the whole terrain.
            ClearLand();
-            using (MemoryStream mstr = new MemoryStream(pBlob))
+            try
            {
-                using (BinaryReader br = new BinaryReader(mstr))
+                using (MemoryStream mstr = new MemoryStream(pBlob))
                {
-                    for (int xx = 0; xx < (int)Constants.RegionSize; xx++)
+                    using (BinaryReader br = new BinaryReader(mstr))
                    {
-                        for (int yy = 0; yy < (int)Constants.RegionSize; yy++)
+                        for (int xx = 0; xx < (int)Constants.RegionSize; xx++)
                        {
-                            float val = (float)br.ReadDouble();
+                            for (int yy = 0; yy < (int)Constants.RegionSize; yy++)
-                            if (xx < SizeX && yy < SizeY)
+                            {
-                                m_heightmap[xx, yy] = ToCompressedHeight(val);
+                                float val = (float)br.ReadDouble();
+                                if (xx < SizeX && yy < SizeY)
+                                    m_heightmap[xx, yy] = val;
+                            }
                        }
                    }
                }
-                ClearTaint();
            }
+            catch
+            {
+                ClearLand();
+            }
+            ClearTaint();
+        }
+        // stores as variable2D
+        // int32 sizeX
+        // int32 sizeY
+        // float[,] array
+        public Array ToCompressedTerrainSerializationV2D()
+        {
+            Array ret = null;
+            try
+            {
+                using (MemoryStream str = new MemoryStream((2 * sizeof(Int32)) + (SizeX * SizeY * sizeof(float))))
+                {
+                    using (BinaryWriter bw = new BinaryWriter(str))
+                    {
+                        bw.Write((Int32)SizeX);
+                        bw.Write((Int32)SizeY);
+                        for (int yy = 0; yy < SizeY; yy++)
+                            for (int xx = 0; xx < SizeX; xx++)
+                            {
+                                // reduce to 1cm resolution
+                                float val = (float)Math.Round(m_heightmap[xx, yy],2,MidpointRounding.ToEven);
+                                bw.Write(val);
+                            }
+                    }
+                    ret = str.ToArray();
+                }
+            }
+            catch
+            {
+            }
+            m_log.DebugFormat("{0} V2D {1} bytes",
+                     LogHeader, ret.Length);
+            return ret;
        }
-        
-        // See the reader below.
+        // as above with Gzip compression
-        public Array ToCompressedTerrainSerialization()
+        public Array ToCompressedTerrainSerializationV2DGzip()
        {
            Array ret = null;
-            using (MemoryStream str = new MemoryStream((3 * sizeof(Int32)) + (SizeX * SizeY * sizeof(Int16))))
+            try
            {
-                using (BinaryWriter bw = new BinaryWriter(str))
+                using (MemoryStream inp = new MemoryStream((2 * sizeof(Int32)) + (SizeX * SizeY * sizeof(float))))
                {
-                    bw.Write((Int32)DBTerrainRevision.Compressed2D);
+                    using (BinaryWriter bw = new BinaryWriter(inp))
-                    bw.Write((Int32)SizeX);
+                    {
-                    bw.Write((Int32)SizeY);
+                        bw.Write((Int32)SizeX);
-                    bw.Write((Int32)CompressionFactor);
+                        bw.Write((Int32)SizeY);
-                    for (int yy = 0; yy < SizeY; yy++)
+                        for (int yy = 0; yy < SizeY; yy++)
-                        for (int xx = 0; xx < SizeX; xx++)
+                            for (int xx = 0; xx < SizeX; xx++)
+                            {
+                                bw.Write((float)m_heightmap[xx, yy]);
+                            }
+                        bw.Flush();
+                        inp.Seek(0, SeekOrigin.Begin);
+                        using (MemoryStream outputStream = new MemoryStream())
                        {
-                            bw.Write((Int16)m_heightmap[xx, yy]);
+                            using (GZipStream compressionStream = new GZipStream(outputStream, CompressionMode.Compress))
+                            {
+                                inp.CopyStream(compressionStream, int.MaxValue);
+                                compressionStream.Close();
+                                ret = outputStream.ToArray();
+                            }
                        }
+                    }
                }
-                ret = str.ToArray();
            }
+            catch
+            {
+            }
+            m_log.DebugFormat("{0} V2DGzip {1} bytes",
+                 LogHeader, ret.Length);
            return ret;
        }
@@ -426,7 +535,7 @@ namespace OpenSim.Framework
        //    the forth int is the compression factor for the following int16s
        // This is just sets heightmap info. The actual size of the region was set on this instance's
        //    creation and any heights not initialized by theis blob are set to the default height.
-        public void FromCompressedTerrainSerialization(byte[] pBlob)
+        public void FromCompressedTerrainSerialization2D(byte[] pBlob)
        {
            Int32 hmFormatCode, hmSizeX, hmSizeY, hmCompressionFactor;
@@ -448,7 +557,7 @@ namespace OpenSim.Framework
                    {
                        for (int xx = 0; xx < hmSizeX; xx++)
                        {
-                            Int16 val = br.ReadInt16();
+                            float val = FromCompressedHeight(br.ReadInt16());
                            if (xx < SizeX && yy < SizeY)
                                m_heightmap[xx, yy] = val;
                        }
@@ -456,9 +565,112 @@ namespace OpenSim.Framework
                }
                ClearTaint();
-                m_log.InfoFormat("{0} Read compressed 2d heightmap. Heightmap size=<{1},{2}>. Region size=<{3},{4}>. CompFact={5}",
+                m_log.DebugFormat("{0} Read (compressed2D) heightmap. Heightmap size=<{1},{2}>. Region size=<{3},{4}>. CompFact={5}",
                                LogHeader, hmSizeX, hmSizeY, SizeX, SizeY, hmCompressionFactor);
            }
        }
+        // Initialize heightmap from blob consisting of:
+        //    int32, int32, int32, float[]
+        //    where the first int32 is format code, next two int32s are the X and y of heightmap data
+        // This is just sets heightmap info. The actual size of the region was set on this instance's
+        //    creation and any heights not initialized by theis blob are set to the default height.
+        public void FromCompressedTerrainSerializationV2D(byte[] pBlob)
+        {
+            Int32 hmSizeX, hmSizeY;
+            try
+            {
+                using (MemoryStream mstr = new MemoryStream(pBlob))
+                {
+                    using (BinaryReader br = new BinaryReader(mstr))
+                    {
+                        hmSizeX = br.ReadInt32();
+                        hmSizeY = br.ReadInt32();
+                        // In case database info doesn't match real terrain size, initialize the whole terrain.
+                        ClearLand();
+                        for (int yy = 0; yy < hmSizeY; yy++)
+                        {
+                            for (int xx = 0; xx < hmSizeX; xx++)
+                            {
+                                float val = br.ReadSingle();
+                                if (xx < SizeX && yy < SizeY)
+                                    m_heightmap[xx, yy] = val;
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception e)
+            {
+                ClearTaint();
+                m_log.ErrorFormat("{0} 2D error: {1} - terrain may be damaged",
+                                LogHeader, e.Message);
+                return;
+            }
+            ClearTaint();
+            m_log.DebugFormat("{0} V2D Heightmap size=<{1},{2}>. Region size=<{3},{4}>",
+                            LogHeader, hmSizeX, hmSizeY, SizeX, SizeY);
+        }
+        // as above but Gzip compressed
+        public void FromCompressedTerrainSerializationV2DGZip(byte[] pBlob)
+        {
+            m_log.InfoFormat("{0} VD2Gzip {1} bytes input",
+                            LogHeader, pBlob.Length);
+            Int32 hmSizeX, hmSizeY;
+            try
+            {
+                using (MemoryStream outputStream = new MemoryStream())
+                {
+                    using (MemoryStream inputStream = new MemoryStream(pBlob))
+                    {
+                        using (GZipStream decompressionStream = new GZipStream(inputStream, CompressionMode.Decompress))
+                        {
+                            decompressionStream.Flush();
+                            decompressionStream.CopyTo(outputStream);
+                        }
+                    }
+                    outputStream.Seek(0, SeekOrigin.Begin);
+                    using (BinaryReader br = new BinaryReader(outputStream))
+                    {
+                        hmSizeX = br.ReadInt32();
+                        hmSizeY = br.ReadInt32();
+                        // In case database info doesn't match real terrain size, initialize the whole terrain.
+                        ClearLand();
+                        for (int yy = 0; yy < hmSizeY; yy++)
+                        {
+                            for (int xx = 0; xx < hmSizeX; xx++)
+                            {
+                                float val = br.ReadSingle();
+                                if (xx < SizeX && yy < SizeY)
+                                    m_heightmap[xx, yy] = val;
+                            }
+                        }
+                    }
+                }
+            }
+            catch( Exception e)
+            {
+                ClearTaint();
+                m_log.ErrorFormat("{0} V2DGzip error: {1} - terrain may be damaged",
+                                LogHeader, e.Message);
+                return;
+            }
+            ClearTaint();
+            m_log.DebugFormat("{0} V2DGzip. Heightmap size=<{1},{2}>. Region size=<{3},{4}>",
+                            LogHeader, hmSizeX, hmSizeY, SizeX, SizeY);
+        }
    }
 }
diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
index 95e9439..5ad0030 100644
--- a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Tests
            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_FOOT_SIZE] = 45;
-            // head 
+            // head
            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HEAD_SIZE] = 255;
            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_SQUASH_STRETCH_HEAD] = 0; // head stretch
            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HEAD_SHAPE] = 155;
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Tests
            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_FACE_SHEAR] = 127;
            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_FOREHEAD_ANGLE] = 104;
            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_BIG_BROW] = 94;
-            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_PUFFY_UPPER_CHEEKS] = 0; //  upper cheeks 
+            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_PUFFY_UPPER_CHEEKS] = 0; //  upper cheeks
            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_DOUBLE_CHIN] = 122; //  lower cheeks
            VisualParams[(int)AvatarAppearance.VPElement.SHAPE_HIGH_CHEEK_BONES] = 130;
@@ -232,7 +232,7 @@ namespace OpenSim.Framework.Tests
        /// <summary>
        /// Test to ensure that the serialization format is the same and the underlying types don't change without notice
        /// oldSerialization is just a json serialization of the OSDMap packed for the AgentCircuitData.
-        /// The idea is that if the current json serializer cannot parse the old serialization, then the underlying types 
+        /// The idea is that if the current json serializer cannot parse the old serialization, then the underlying types
        /// have changed and are incompatible.
        /// </summary>
        [Test]
@@ -311,14 +311,15 @@ namespace OpenSim.Framework.Tests
           Agent1Data.SessionID = SessionId;
           Agent1Data.startpos = StartPos;
+            EntityTransferContext ctx = new EntityTransferContext();
            OSDMap map2;
-            OSDMap map = Agent1Data.PackAgentCircuitData();
+            OSDMap map = Agent1Data.PackAgentCircuitData(ctx);
            try
            {
                string str = OSDParser.SerializeJsonString(map);
                //System.Console.WriteLine(str);
                map2 = (OSDMap) OSDParser.DeserializeJson(str);
-            } 
+            }
            catch (System.NullReferenceException)
            {
                //spurious litjson errors :P
diff --git a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
index ae132c8..b572afc 100644
--- a/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitManagerTests.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Tests
            resp = agentCircuitManager.AuthenticateSession(UUID.Random(), AgentId1, circuitcode1);
            Assert.That(!resp.Authorised);
-            
            resp = agentCircuitManager.AuthenticateSession(SessionId1, AgentId1, circuitcode2);
            Assert.That(!resp.Authorised);
diff --git a/OpenSim/Framework/Tests/AnimationTests.cs b/OpenSim/Framework/Tests/AnimationTests.cs
index d8f17d0..daf8611 100644
--- a/OpenSim/Framework/Tests/AnimationTests.cs
+++ b/OpenSim/Framework/Tests/AnimationTests.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Framework.Tests
            anim4.AnimID = anim2.AnimID;
            anim4.ObjectID = anim2.ObjectID;
            anim4.SequenceNum = anim2.SequenceNum;
-            
            Assert.That(anim4.ObjectID == objUUID2 && anim4.AnimID == animUUID2 && anim4.SequenceNum == 1, "void constructor and manual field population failed to set the properties correctly.");
        }
    }
diff --git a/OpenSim/Framework/Tests/CacheTests.cs b/OpenSim/Framework/Tests/CacheTests.cs
index c709860..a92ff3c 100644
--- a/OpenSim/Framework/Tests/CacheTests.cs
+++ b/OpenSim/Framework/Tests/CacheTests.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Tests
            Assert.That(citem == null, "Item should not be in Cache");
        }
-        
        [Test]
        public void ExpireItemManually()
        {
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Tests
            cachedItem.Store(foo);
            cache.Store(cacheItemUUID.ToString(), cachedItem);
            cache.Clear();
-  
            object citem = cache.Get(cacheItemUUID.ToString());
            Assert.That(citem == null, "Item should not be in Cache because we manually invalidated it");
        }
diff --git a/OpenSim/Framework/Tests/LocationTest.cs b/OpenSim/Framework/Tests/LocationTest.cs
index 3d5d1d2..5e84026 100644
--- a/OpenSim/Framework/Tests/LocationTest.cs
+++ b/OpenSim/Framework/Tests/LocationTest.cs
@@ -85,6 +85,6 @@ namespace OpenSim.Framework.Tests
            Assert.That(TestLocation2.Equals(cln), "Cloned object failed .Equals(obj) Test");
        }
-        
    }
 }
diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
index 3f0a031..bde7056 100644
--- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
+++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs
@@ -110,13 +110,14 @@ namespace OpenSim.Framework.Tests
                && position2.Center == position1.Center
                && position2.RegionHandle == position1.RegionHandle
                && position2.Far == position1.Far
-               
                ,"Copy From ChildAgentDataUpdate failed");
            position2 = new AgentPosition();
            Assert.IsFalse(position2.AgentID == position1.AgentID, "Test Error, position2 should be a blank uninitialized AgentPosition");
-            position2.Unpack(position1.Pack(), null);
+            EntityTransferContext ctx = new EntityTransferContext();
+            position2.Unpack(position1.Pack(ctx), null, ctx);
            Assert.IsTrue(position2.AgentID == position1.AgentID, "Agent ID didn't unpack the same way it packed");
            Assert.IsTrue(position2.Position == position1.Position, "Position didn't unpack the same way it packed");
@@ -147,13 +148,13 @@ namespace OpenSim.Framework.Tests
 //            string time = settings.LoadedCreationTime;
            Assert.That(m_RegionSettingsOnSaveEventFired, "RegionSettings Save Event didn't Fire");
-            
        }
        public void RegionSaveFired(RegionSettings settings)
        {
            m_RegionSettingsOnSaveEventFired = true;
        }
-        
        [Test]
        public void InventoryItemBaseConstructorTest01()
        {
@@ -163,7 +164,7 @@ namespace OpenSim.Framework.Tests
            UUID ItemID = UUID.Random();
            UUID OwnerID = UUID.Random();
-            
            InventoryItemBase b2 = new InventoryItemBase(ItemID);
            Assert.That(b2.ID == ItemID, "ID constructor should create an inventory item with ID = ItemID");
            Assert.That(b2.Owner == UUID.Zero, "ID constructor  should create an inventory item with Owner = UUID.Zero");
@@ -218,12 +219,12 @@ namespace OpenSim.Framework.Tests
                              BannedHostNameMask = string.Empty,
                              BannedUserID = bannedUserId}
                          );
-            Assert.IsTrue(es.IsBanned(bannedUserId), "User Should be banned but is not.");
+            Assert.IsTrue(es.IsBanned(bannedUserId, 32), "User Should be banned but is not.");
-            Assert.IsFalse(es.IsBanned(UUID.Zero), "User Should not be banned but is.");
+            Assert.IsFalse(es.IsBanned(UUID.Zero, 32), "User Should not be banned but is.");
            es.RemoveBan(bannedUserId);
-            Assert.IsFalse(es.IsBanned(bannedUserId), "User Should not be banned but is.");
+            Assert.IsFalse(es.IsBanned(bannedUserId, 32), "User Should not be banned but is.");
            es.AddEstateManager(UUID.Zero);
@@ -267,7 +268,7 @@ namespace OpenSim.Framework.Tests
            Assert.That(fld.ID == uuid1, "ID,Owner constructor failed to save value in ID field.");
            Assert.That(fld.Owner == uuid2, "ID,Owner constructor failed to save value in ID field.");
        }
-        
        [Test]
        public void AsssetBaseConstructorTest01()
        {
@@ -303,6 +304,6 @@ namespace OpenSim.Framework.Tests
            Culture.SetCurrentCulture();
            Assert.That(Thread.CurrentThread.CurrentCulture.Name == ci.Name, "SetCurrentCulture failed to set thread culture to en-US");
-        }     
+        }
    }
-}
-\ No newline at end of file
+}
diff --git a/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs b/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
index 82e13e5..cc30fb9 100644
--- a/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
+++ b/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
@@ -127,9 +127,9 @@ namespace OpenSim.Framework.Tests
            int[] nonprimes = {
                               4, 6, 8, 10, 14, 16, 18, 22, 28, 30, 36, 40, 42, 46, 52, 58, 60, 66, 70, 72, 78, 82, 88,
-                               96,  366, 372, 378, 382, 388, 396, 400, 408, 418, 420, 430, 432, 438, 442, 448, 456, 460, 462, 
+                               96,  366, 372, 378, 382, 388, 396, 400, 408, 418, 420, 430, 432, 438, 442, 448, 456, 460, 462,
-                               466, 478, 486, 490, 498, 502, 508, 856, 858, 862, 876, 880, 882, 886, 906, 910, 918, 928, 936, 
+                               466, 478, 486, 490, 498, 502, 508, 856, 858, 862, 876, 880, 882, 886, 906, 910, 918, 928, 936,
-                               940, 946, 952, 966, 970, 976, 982, 990, 996, 1008, 1740, 1746, 1752, 1758, 4650, 4656, 4662, 
+                               940, 946, 952, 966, 970, 976, 982, 990, 996, 1008, 1740, 1746, 1752, 1758, 4650, 4656, 4662,
                               4672, 4678, 4690, 7740, 7752, 7756, 7758, 7788, 7792, 7816, 7822, 7828, 7840, 7852, 7866, 7872,
                               7876, 7878, 7882, 7900, 7906, 7918
                           };
diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs
index cfe3139..b3d79ee 100644
--- a/OpenSim/Framework/Tests/UtilTest.cs
+++ b/OpenSim/Framework/Tests/UtilTest.cs
@@ -59,12 +59,12 @@ namespace OpenSim.Framework.Tests
                Assert.That(Util.GetMagnitude(v2),
                            new DoubleToleranceConstraint(expectedMagnitude, lowPrecisionTolerance),
                            "Magnitude of vector was incorrect.");
+/*
                TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };
                bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
                Assert.That(causesArgumentException, Is.True,
                            "Getting magnitude of null vector did not cause argument exception.");
+*/
                Vector3 expectedNormalizedVector = new Vector3(.577f, .577f, .577f);
                double expectedNormalizedMagnitude = 1;
                Vector3 normalizedVector = Util.GetNormalizedVector(v2);
@@ -92,7 +92,7 @@ namespace OpenSim.Framework.Tests
                Assert.That(Util.GetMagnitude(v2),
                            new DoubleToleranceConstraint(expectedMagnitude, lowPrecisionTolerance),
                            "Magnitude of vector was incorrect.");
+/*
                TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };
                bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
                Assert.That(causesArgumentException, Is.True,
@@ -102,6 +102,7 @@ namespace OpenSim.Framework.Tests
                causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
                Assert.That(causesArgumentException, Is.True,
                            "Getting magnitude of null vector did not cause argument exception.");
+*/
            }
            //Lets test a simple case of <0,0,0> and <-5,-5,-5>
@@ -120,12 +121,12 @@ namespace OpenSim.Framework.Tests
                Assert.That(Util.GetMagnitude(v2),
                            new DoubleToleranceConstraint(expectedMagnitude, lowPrecisionTolerance),
                            "Magnitude of vector was incorrect.");
+/*
                TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };
                bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
                Assert.That(causesArgumentException, Is.True,
                            "Getting magnitude of null vector did not cause argument exception.");
+*/
                Vector3 expectedNormalizedVector = new Vector3(-.577f, -.577f, -.577f);
                double expectedNormalizedMagnitude = 1;
                Vector3 normalizedVector = Util.GetNormalizedVector(v2);
@@ -232,7 +233,7 @@ namespace OpenSim.Framework.Tests
                                               "application/vnd.ll.clothing",
                                               "application/vnd.ll.gesture"
                                           };
-        
            for (int i=0;i<inventorytypes.Length;i++)
            {
                Assert.AreEqual(invcontenttypes[i], SLUtil.SLInvTypeToContentType(inventorytypes[i]),
diff --git a/OpenSim/Framework/ThrottleOutPacketType.cs b/OpenSim/Framework/ThrottleOutPacketType.cs
index ca4b126..87899f0 100644
--- a/OpenSim/Framework/ThrottleOutPacketType.cs
+++ b/OpenSim/Framework/ThrottleOutPacketType.cs
@@ -47,6 +47,8 @@ namespace OpenSim.Framework
        Texture = 5,
        /// <summary>Non-texture assets</summary>
        Asset = 6,
+        HighPriority = 128,
    }
    [Flags]
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index 266ccf0..d8fa629 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -159,12 +159,12 @@ namespace OpenSim.Framework
        /// </summary>
        public virtual ulong HomeRegion
        {
-            get 
+            get
            {
                return Util.RegionWorldLocToHandle(Util.RegionToWorldLoc(m_homeRegionX), Util.RegionToWorldLoc(m_homeRegionY));
-                // return Utils.UIntsToLong( m_homeRegionX * (uint)Constants.RegionSize, m_homeRegionY * (uint)Constants.RegionSize); 
+                // return Utils.UIntsToLong( m_homeRegionX * (uint)Constants.RegionSize, m_homeRegionY * (uint)Constants.RegionSize);
            }
-            
            set
            {
                uint regionWorldLocX, regionWorldLocY;
@@ -212,7 +212,7 @@ namespace OpenSim.Framework
            get { return m_surname; }
            set { m_surname = value; }
        }
-        
        /// <value>
        /// The concatentation of the various name components.
        /// </value>
diff --git a/OpenSim/Framework/UserProfiles.cs b/OpenSim/Framework/UserProfiles.cs
index 98ab651..7c6a6fe 100644
--- a/OpenSim/Framework/UserProfiles.cs
+++ b/OpenSim/Framework/UserProfiles.cs
@@ -27,6 +27,8 @@
 using System;
 using OpenMetaverse;
+using System.Collections.Generic;
 namespace OpenSim.Framework
 {
@@ -48,7 +50,7 @@ namespace OpenSim.Framework
        public byte Flags = 0;
        public int Price = 0;
    }
-    
    public class UserProfileProperties
    {
        public UUID UserId = UUID.Zero;
@@ -66,7 +68,7 @@ namespace OpenSim.Framework
        public UUID FirstLifeImageId = UUID.Zero;
        public string FirstLifeText = string.Empty;
    }
-    
    public class UserProfilePick
    {
        public UUID PickId = UUID.Zero;
@@ -84,7 +86,7 @@ namespace OpenSim.Framework
        public int SortOrder = 0;
        public bool Enabled = false;
    }
-    
    public class UserProfileNotes
    {
        public UUID UserId;
@@ -99,7 +101,7 @@ namespace OpenSim.Framework
        public bool Visible = false;
        public string EMail = string.Empty;
    }
-    
    public class UserAccountProperties
    {
        public string EmailAddress = string.Empty;
@@ -108,13 +110,13 @@ namespace OpenSim.Framework
        public string Password = string.Empty;
        public string UserId = string.Empty;
    }
-    
    public class UserAccountAuth
    {
        public string UserId = UUID.Zero.ToString();
        public string Password = string.Empty;
    }
-    
    public class UserAppData
    {
        public string TagId = string.Empty;
@@ -122,5 +124,18 @@ namespace OpenSim.Framework
        public string UserId = UUID.Zero.ToString();
        public string DataVal = string.Empty;
    }
+    public class UserProfileCacheEntry
+    {
+        public Dictionary<UUID, string> picksList;
+        public Dictionary<UUID, UserProfilePick> picks;
+        public Dictionary<UUID, string> classifiedsLists;
+        public Dictionary<UUID, UserClassifiedAdd> classifieds;
+        public UserProfileProperties props;
+        public string born;
+        public byte[] membershipType;
+        public uint flags;
+        public HashSet<IClientAPI> ClientsWaitingProps;
+    }
 }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index b5c3e75..7093010 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -59,17 +59,41 @@ namespace OpenSim.Framework
 {
    [Flags]
    public enum PermissionMask : uint
-    { 
+    {
        None = 0,
-        Transfer = 1 << 13,
-        Modify = 1 << 14,
+        // folded perms
-        Copy = 1 << 15,
+        FoldedTransfer = 1,
-        Export = 1 << 16,
+        FoldedModify = 1 << 1,
-        Move = 1 << 19,
+        FoldedCopy = 1 << 2,
-        Damage = 1 << 20,
+        FoldedExport = 1 << 3,
+        // DO NOT USE THIS FOR NEW WORK. IT IS DEPRECATED AND
+        // EXISTS ONLY TO REACT TO EXISTING OBJECTS HAVING IT.
+        // NEW CODE SHOULD NEVER SET THIS BIT!
+        // Use InventoryItemFlags.ObjectSlamPerm in the Flags field of
+        // this legacy slam bit. It comes from prior incomplete
+        // understanding of the code and the prohibition on
+        // reading viewer code that used to be in place.
+        Slam = (1 << 4),
+        FoldedMask = 0x0f,
+        FoldingShift = 13 ,  // number of bit shifts from normal perm to folded or back (same as Transfer shift below)
+                             // when doing as a block
+        Transfer = 1 << 13, // 0x02000
+        Modify = 1 << 14,   // 0x04000
+        Copy = 1 << 15,     // 0x08000
+        Export = 1 << 16,   // 0x10000
+        Move = 1 << 19,     // 0x80000
+        Damage = 1 << 20,   // 0x100000 does not seem to be in use
        // All does not contain Export, which is special and must be
        // explicitly given
-        All = (1 << 13) | (1 << 14) | (1 << 15) | (1 << 19)
+        All = 0x8e000,
+        AllAndExport = 0x9e000,
+        AllEffective = 0x9e000,
+        UnfoldedMask = 0x1e000
    }
    /// <summary>
@@ -103,7 +127,7 @@ namespace OpenSim.Framework
        public STPStartInfo STPStartInfo { get; set; }
        public WIGStartInfo WIGStartInfo { get; set; }
        public bool IsIdle { get; set; }
-        public bool IsShuttingDown { get; set; }       
+        public bool IsShuttingDown { get; set; }
        public int MaxThreads { get; set; }
        public int MinThreads { get; set; }
        public int InUseThreads { get; set; }
@@ -131,10 +155,16 @@ namespace OpenSim.Framework
        public static readonly int MAX_THREADPOOL_LEVEL = 3;
+        public static double TimeStampClockPeriodMS;
+        public static double TimeStampClockPeriod;
        static Util()
        {
            LogThreadPool = 0;
            LogOverloads = true;
+            TimeStampClockPeriod = 1.0D/ (double)Stopwatch.Frequency;
+            TimeStampClockPeriodMS = 1e3 * TimeStampClockPeriod;
+            m_log.InfoFormat("[UTIL] TimeStamp clock with period of {0}ms", Math.Round(TimeStampClockPeriodMS,6,MidpointRounding.AwayFromZero));
        }
        private static uint nextXferID = 5000;
@@ -217,7 +247,7 @@ namespace OpenSim.Framework
        public static Encoding UTF8NoBomEncoding = new UTF8Encoding(false);
        /// <value>
-        /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards) 
+        /// Well known UUID for the blank texture used in the Linden SL viewer version 1.20 (and hopefully onwards)
        /// </value>
        public static UUID BLANK_TEXTURE_UUID = new UUID("5748decc-f629-461c-9a36-a35a221fe21f");
@@ -267,14 +297,12 @@ namespace OpenSim.Framework
        /// </summary>
        /// <param name="a">A 3d vector</param>
        /// <returns>A new vector which is normalized form of the vector</returns>
-        /// <remarks>The vector paramater cannot be <0,0,0></remarks>
        public static Vector3 GetNormalizedVector(Vector3 a)
        {
-            if (IsZeroVector(a))
+            Vector3 v = new Vector3(a.X, a.Y, a.Z);
-                throw new ArgumentException("Vector paramater cannot be a zero vector.");
+            v.Normalize();
+            return v;
-            float Mag = (float) GetMagnitude(a);
-            return new Vector3(a.X / Mag, a.Y / Mag, a.Z / Mag);
        }
        /// <summary>
@@ -357,47 +385,185 @@ namespace OpenSim.Framework
            return Utils.UIntsToLong(X, Y);
        }
-        // Regions are identified with a 'handle' made up of its region coordinates packed into a ulong.
+        // Regions are identified with a 'handle' made up of its world coordinates packed into a ulong.
-        // Several places rely on the ability to extract a region's location from its handle.
+        // Region handles are based on the coordinate of the region corner with lower X and Y
-        // Note the location is in 'world coordinates' (see below).
+        // var regions need more work than this to get that right corner from a generic world position
-        // Region handles are based on the lowest coordinate of the region so trim the passed x,y to be the regions 0,0.
+        // this corner must be on a grid point
        public static ulong RegionWorldLocToHandle(uint X, uint Y)
        {
-            return Utils.UIntsToLong(X, Y);
+           ulong handle = X & 0xffffff00; // make sure it matchs grid coord points.
+           handle <<= 32; // to higher half
+           handle |= (Y & 0xffffff00);
+           return handle;
        }
-        public static ulong RegionLocToHandle(uint X, uint Y)
+        public static ulong RegionGridLocToHandle(uint X, uint Y)
        {
-            return Utils.UIntsToLong(Util.RegionToWorldLoc(X), Util.RegionToWorldLoc(Y));
+            ulong handle = X;
+            handle <<= 40; // shift to higher half and mult by 256)
+            handle |= (Y << 8);  // mult by 256)
+            return handle;
        }
        public static void RegionHandleToWorldLoc(ulong handle, out uint X, out uint Y)
        {
            X = (uint)(handle >> 32);
-            Y = (uint)(handle & (ulong)uint.MaxValue);
+            Y = (uint)(handle & 0xfffffffful);
        }
        public static void RegionHandleToRegionLoc(ulong handle, out uint X, out uint Y)
        {
-            uint worldX, worldY;
+            X = (uint)(handle >> 40) & 0x00ffffffu; //  bring from higher half, divide by 256 and clean
-            RegionHandleToWorldLoc(handle, out worldX, out worldY);
+            Y = (uint)(handle >> 8) & 0x00ffffffu; // divide by 256 and clean
-            X = WorldToRegionLoc(worldX);
+            // if you trust the uint cast then the clean can be removed.
-            Y = WorldToRegionLoc(worldY);
        }
-        // A region location can be 'world coordinates' (meters from zero) or 'region coordinates'
+        // A region location can be 'world coordinates' (meters) or 'region grid coordinates'
-        //      (number of regions from zero). This measurement of regions relies on the legacy 256 region size.
+        // grid coordinates have a fixed step of 256m as defined by viewers
-        // These routines exist to make what is being converted explicit so the next person knows what was meant.
-        // Convert a region's 'world coordinate' to its 'region coordinate'.
        public static uint WorldToRegionLoc(uint worldCoord)
        {
-            return worldCoord / Constants.RegionSize;
+            return worldCoord >> 8;
        }
-        // Convert a region's 'region coordinate' to its 'world coordinate'.
+        // Convert a region's 'region grid coordinate' to its 'world coordinate'.
        public static uint RegionToWorldLoc(uint regionCoord)
        {
-            return regionCoord * Constants.RegionSize;
+            return regionCoord << 8;
+        }
+        public static bool checkServiceURI(string uristr, out string serviceURI)
+        {
+            serviceURI = string.Empty;
+            try
+            {
+                Uri  uri = new Uri(uristr);
+                serviceURI = uri.AbsoluteUri;
+                if(uri.Port == 80)
+                    serviceURI = serviceURI.Trim(new char[] { '/', ' ' }) +":80/";
+                else if(uri.Port == 443)
+                    serviceURI = serviceURI.Trim(new char[] { '/', ' ' }) +":443/";
+                return true;
+            }
+            catch
+            {
+                serviceURI = string.Empty;
+            }
+            return false;
+        }
+        public static bool buildHGRegionURI(string inputName, out string serverURI, out string regionName)
+        {
+            serverURI = string.Empty;
+            regionName = string.Empty;
+            inputName = inputName.Trim();
+            if (!inputName.StartsWith("http") && !inputName.StartsWith("https"))
+            {
+                // Formats: grid.example.com:8002:region name
+                //          grid.example.com:region name
+                //          grid.example.com:8002
+                //          grid.example.com
+                string host;
+                uint port = 80;
+                string[] parts = inputName.Split(new char[] { ':' });
+                int indx;
+                if(parts.Length == 0)
+                    return false;
+                if (parts.Length == 1)
+                {
+                    indx = inputName.IndexOf('/');
+                    if (indx < 0)
+                        serverURI = "http://"+ inputName + "/";
+                    else
+                    {
+                        serverURI = "http://"+ inputName.Substring(0,indx + 1);
+                        if(indx + 2 < inputName.Length)
+                            regionName = inputName.Substring(indx + 1);
+                    }
+                }
+                else
+                {
+                    host = parts[0];
+                    if (parts.Length >= 2)
+                    {
+                        indx = parts[1].IndexOf('/');
+                        if(indx < 0)
+                        {
+                            // If it's a number then assume it's a port. Otherwise, it's a region name.
+                            if (!UInt32.TryParse(parts[1], out port))
+                            {
+                                port = 80;
+                                regionName = parts[1];
+                            }
+                        }
+                        else
+                        {
+                            string portstr = parts[1].Substring(0, indx);
+                            if(indx + 2 < parts[1].Length)
+                                regionName = parts[1].Substring(indx + 1);
+                            if (!UInt32.TryParse(portstr, out port))
+                                port = 80;
+                        }
+                    }
+                    // always take the last one
+                    if (parts.Length >= 3)
+                    {
+                       regionName = parts[2];
+                    }
+                    serverURI = "http://"+ host +":"+ port.ToString() + "/";
+                }
+            }
+            else
+            {
+                // Formats: http://grid.example.com region name
+                //          http://grid.example.com "region name"
+                //          http://grid.example.com
+                string[] parts = inputName.Split(new char[] { ' ' });
+                if (parts.Length == 0)
+                    return false;
+                serverURI = parts[0];
+                int indx = serverURI.LastIndexOf('/');
+                if(indx > 10)
+                {
+                    if(indx + 2 < inputName.Length)
+                        regionName = inputName.Substring(indx + 1);
+                    serverURI = inputName.Substring(0, indx + 1);
+                }
+                else if (parts.Length >= 2)
+                {
+                    regionName = inputName.Substring(serverURI.Length);
+                }
+            }
+            // use better code for sanity check
+            Uri uri;
+            try
+            {
+                    uri = new Uri(serverURI);
+            }
+            catch
+            {
+                return false;
+            }
+            if(!string.IsNullOrEmpty(regionName))
+                regionName = regionName.Trim(new char[] { '"', ' ' });
+            serverURI = uri.AbsoluteUri;
+            if(uri.Port == 80)
+                serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":80/";
+            else if(uri.Port == 443)
+                serverURI = serverURI.Trim(new char[] { '/', ' ' }) +":443/";
+            return true;
        }
        public static T Clamp<T>(T x, T min, T max)
@@ -505,6 +671,7 @@ namespace OpenSim.Framework
        public static string GetFormattedXml(string rawXml)
        {
            XmlDocument xd = new XmlDocument();
+            xd.XmlResolver=null;
            xd.LoadXml(rawXml);
            StringBuilder sb = new StringBuilder();
@@ -641,19 +808,25 @@ namespace OpenSim.Framework
        /// </summary>
        /// <param name="data"></param>
        /// <returns></returns>
        public static string Md5Hash(string data)
        {
-            byte[] dataMd5 = ComputeMD5Hash(data);
+            return Md5Hash(data, Encoding.Default);
+        }
+        public static string Md5Hash(string data, Encoding encoding)
+        {
+            byte[] dataMd5 = ComputeMD5Hash(data, encoding);
            StringBuilder sb = new StringBuilder();
            for (int i = 0; i < dataMd5.Length; i++)
                sb.AppendFormat("{0:x2}", dataMd5[i]);
            return sb.ToString();
        }
-        private static byte[] ComputeMD5Hash(string data)
+        private static byte[] ComputeMD5Hash(string data, Encoding encoding)
        {
            MD5 md5 = MD5.Create();
-            return md5.ComputeHash(Encoding.Default.GetBytes(data));
+            return md5.ComputeHash(encoding.GetBytes(data));
        }
        /// <summary>
@@ -661,6 +834,12 @@ namespace OpenSim.Framework
        /// </summary>
        /// <param name="data"></param>
        /// <returns></returns>
+        public static string SHA1Hash(string data, Encoding enc)
+        {
+            return SHA1Hash(enc.GetBytes(data));
+        }
        public static string SHA1Hash(string data)
        {
            return SHA1Hash(Encoding.Default.GetBytes(data));
@@ -679,8 +858,10 @@ namespace OpenSim.Framework
        private static byte[] ComputeSHA1Hash(byte[] src)
        {
-            SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider();
+            byte[] ret;
-            return SHA1.ComputeHash(src);
+            using(SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider())
+                 ret = SHA1.ComputeHash(src);
+            return ret;
        }
        public static int fast_distance2d(int x, int y)
@@ -713,18 +894,27 @@ namespace OpenSim.Framework
        /// <param name="newx">New region x-coord</param>
        /// <param name="oldy">Old region y-coord</param>
        /// <param name="newy">New region y-coord</param>
-        /// <returns></returns>        
+        /// <returns></returns>
-        public static bool IsOutsideView(float drawdist, uint oldx, uint newx, uint oldy, uint newy)
+        public static bool IsOutsideView(float drawdist, uint oldx, uint newx, uint oldy, uint newy,
-        {
+            int oldsizex, int oldsizey, int newsizex, int newsizey)
-            int dd = (int)((drawdist + Constants.RegionSize - 1) / Constants.RegionSize);
+        {
+            // we still need to make sure we see new region  1stNeighbors
-            int startX = (int)oldx - dd;
+            drawdist--;
-            int startY = (int)oldy - dd;
+            oldx *= Constants.RegionSize;
+            newx *= Constants.RegionSize;
+            if (oldx + oldsizex + drawdist < newx)
+                return true;
+            if (newx + newsizex + drawdist < oldx)
+                return true;
-            int endX = (int)oldx + dd;
+            oldy *= Constants.RegionSize;
-            int endY = (int)oldy + dd;
+            newy *= Constants.RegionSize;
+            if (oldy + oldsizey + drawdist < newy)
+                return true;
+            if (newy + newsizey + drawdist < oldy)
+                return true;
-            return (newx < startX || endX < newx || newy < startY || endY < newy);
+            return false;
        }
        public static string FieldToString(byte[] bytes)
@@ -804,6 +994,18 @@ namespace OpenSim.Framework
            return output.ToString();
        }
+        private static ExpiringCache<string,IPAddress> dnscache = new ExpiringCache<string, IPAddress>();
+        /// <summary>
+        /// Converts a URL to a IPAddress
+        /// </summary>
+        /// <param name="url">URL Standard Format</param>
+        /// <returns>A resolved IP Address</returns>
+        public static IPAddress GetHostFromURL(string url)
+        {
+            return GetHostFromDNS(url.Split(new char[] {'/', ':'})[3]);
+        }
        /// <summary>
        /// Returns a IP address from a specified DNS, favouring IPv4 addresses.
        /// </summary>
@@ -811,38 +1013,128 @@ namespace OpenSim.Framework
        /// <returns>An IP address, or null</returns>
        public static IPAddress GetHostFromDNS(string dnsAddress)
        {
-            // Is it already a valid IP? No need to look it up.
+            if(String.IsNullOrWhiteSpace(dnsAddress))
-            IPAddress ipa;
+                return null;
-            if (IPAddress.TryParse(dnsAddress, out ipa))
-                return ipa;
-            IPAddress[] hosts = null;
+            IPAddress ia = null;
+            if(dnscache.TryGetValue(dnsAddress, out ia) && ia != null)
+            {
+                dnscache.AddOrUpdate(dnsAddress, ia, 300);
+                return ia;
+            }
-            // Not an IP, lookup required
+            ia = null;
+            // If it is already an IP, don't let GetHostEntry see it
+            if (IPAddress.TryParse(dnsAddress, out ia) && ia != null)
+            {
+                if (ia.Equals(IPAddress.Any) || ia.Equals(IPAddress.IPv6Any))
+                    return null;
+                dnscache.AddOrUpdate(dnsAddress, ia, 300);
+                return ia;
+            }
+            IPHostEntry IPH;
            try
            {
-                hosts = Dns.GetHostEntry(dnsAddress).AddressList;
+                IPH = Dns.GetHostEntry(dnsAddress);
            }
-            catch (Exception e)
+            catch // (SocketException e)
+            {
+                return null;
+            }
+            if(IPH == null || IPH.AddressList.Length == 0)
+                return null;
+            ia = null;
+            foreach (IPAddress Adr in IPH.AddressList)
            {
-                m_log.WarnFormat("[UTIL]: An error occurred while resolving host name {0}, {1}", dnsAddress, e);
+                if (ia == null)
+                    ia = Adr;
-                // Still going to throw the exception on for now, since this was what was happening in the first place
+                if (Adr.AddressFamily == AddressFamily.InterNetwork)
-                throw e;
+                {
+                    ia = Adr;
+                    break;
+                }
            }
+            if(ia != null)
+                dnscache.AddOrUpdate(dnsAddress, ia, 300);
+            return ia;
+        }
-            foreach (IPAddress host in hosts)
+        public static IPEndPoint getEndPoint(IPAddress ia, int port)
+        {
+            if(ia == null)
+                return null;
+            IPEndPoint newEP = null;
+            try
+            {
+                newEP = new IPEndPoint(ia, port);
+            }
+            catch
+            {
+                newEP = null;
+            }
+            return newEP;
+        }
+        public static IPEndPoint getEndPoint(string hostname, int port)
+        {
+            if(String.IsNullOrWhiteSpace(hostname))
+                return null;
+            
+            IPAddress ia = null;
+            if(dnscache.TryGetValue(hostname, out ia) && ia != null)
+            {
+                dnscache.AddOrUpdate(hostname, ia, 300);
+                return getEndPoint(ia, port);
+            }
+            ia = null;
+            // If it is already an IP, don't let GetHostEntry see it
+            if (IPAddress.TryParse(hostname, out ia) && ia != null)
+            {
+                if (ia.Equals(IPAddress.Any) || ia.Equals(IPAddress.IPv6Any))
+                    return null;
+                dnscache.AddOrUpdate(hostname, ia, 300);
+                return getEndPoint(ia, port);
+            }
+            IPHostEntry IPH;
+            try
+            {
+                IPH = Dns.GetHostEntry(hostname);
+            }
+            catch // (SocketException e)
+            {
+                return null;
+            }
+            if(IPH == null || IPH.AddressList.Length == 0)
+                return null;
+            ia = null;
+            foreach (IPAddress Adr in IPH.AddressList)
            {
-                if (host.AddressFamily == AddressFamily.InterNetwork)
+                if (ia == null)
+                    ia = Adr;
+                if (Adr.AddressFamily == AddressFamily.InterNetwork)
                {
-                    return host;
+                    ia = Adr;
+                    break;
                }
            }
-            if (hosts.Length > 0)
+            if(ia != null)
-                return hosts[0];
+                dnscache.AddOrUpdate(hostname, ia, 300);
-            return null;
+            return getEndPoint(ia,port);
        }
        public static Uri GetURI(string protocol, string hostname, int port, string path)
@@ -987,7 +1279,7 @@ namespace OpenSim.Framework
        public static string configDir()
        {
-            return "../config";
+            return ".";
        }
        public static string dataDir()
@@ -999,13 +1291,26 @@ namespace OpenSim.Framework
        {
            foreach (IAppender appender in LogManager.GetRepository().GetAppenders())
            {
-                if (appender is FileAppender)
+                if (appender is FileAppender && appender.Name == "LogFileAppender")
                {
                    return ((FileAppender)appender).File;
                }
            }
-            return "../logs/OpenSim.log";
+            return "./OpenSim.log";
+        }
+        public static string statsLogFile()
+        {
+            foreach (IAppender appender in LogManager.GetRepository().GetAppenders())
+            {
+                if (appender is FileAppender && appender.Name == "StatsLogFileAppender")
+                {
+                    return ((FileAppender)appender).File;
+                }
+            }
+            return "./OpenSimStats.log";
        }
        public static string logDir()
@@ -1065,9 +1370,28 @@ namespace OpenSim.Framework
            }
        }
+        public static string GetConfigVarWithDefaultSection(IConfigSource config, string varname, string section)
+        {
+            // First, check the Startup section, the default section
+            IConfig cnf = config.Configs["Startup"];
+            if (cnf == null)
+                return string.Empty;
+            string val = cnf.GetString(varname, string.Empty);
+            // Then check for an overwrite of the default in the given section
+            if (!string.IsNullOrEmpty(section))
+            {
+                cnf = config.Configs[section];
+                if (cnf != null)
+                    val = cnf.GetString(varname, val);
+            }
+            return val;
+        }
        /// <summary>
        /// Gets the value of a configuration variable by looking into
-        /// multiple sections in order. The latter sections overwrite 
+        /// multiple sections in order. The latter sections overwrite
        /// any values previously found.
        /// </summary>
        /// <typeparam name="T">Type of the variable</typeparam>
@@ -1082,7 +1406,7 @@ namespace OpenSim.Framework
        /// <summary>
        /// Gets the value of a configuration variable by looking into
-        /// multiple sections in order. The latter sections overwrite 
+        /// multiple sections in order. The latter sections overwrite
        /// any values previously found.
        /// </summary>
        /// <remarks>
@@ -1138,7 +1462,7 @@ namespace OpenSim.Framework
                ConfigSource.ExpandKeyValues();
            }
        }
-        
        public static T ReadSettingsFromIniFile<T>(IConfig config, T settingsClass)
        {
            Type settingsType = settingsClass.GetType();
@@ -1249,7 +1573,7 @@ namespace OpenSim.Framework
            if (File.Exists(configFile))
            {
-                // Merge 
+                // Merge
                config.Merge(new IniConfigSource(configFile));
                config.ExpandKeyValues();
                configFilePath = configFile;
@@ -1388,6 +1712,46 @@ namespace OpenSim.Framework
            return ret;
        }
+        public static string Compress(string text)
+        {
+            byte[] buffer = Util.UTF8.GetBytes(text);
+            MemoryStream memory = new MemoryStream();
+            using (GZipStream compressor = new GZipStream(memory, CompressionMode.Compress, true))
+            {
+                compressor.Write(buffer, 0, buffer.Length);
+            }
+            memory.Position = 0;
+            byte[] compressed = new byte[memory.Length];
+            memory.Read(compressed, 0, compressed.Length);
+            byte[] compressedBuffer = new byte[compressed.Length + 4];
+            Buffer.BlockCopy(compressed, 0, compressedBuffer, 4, compressed.Length);
+            Buffer.BlockCopy(BitConverter.GetBytes(buffer.Length), 0, compressedBuffer, 0, 4);
+            return Convert.ToBase64String(compressedBuffer);
+        }
+        public static string Decompress(string compressedText)
+        {
+            byte[] compressedBuffer = Convert.FromBase64String(compressedText);
+            using (MemoryStream memory = new MemoryStream())
+            {
+                int msgLength = BitConverter.ToInt32(compressedBuffer, 0);
+                memory.Write(compressedBuffer, 4, compressedBuffer.Length - 4);
+                byte[] buffer = new byte[msgLength];
+                memory.Position = 0;
+                using (GZipStream decompressor = new GZipStream(memory, CompressionMode.Decompress))
+                {
+                    decompressor.Read(buffer, 0, buffer.Length);
+                }
+                return Util.UTF8.GetString(buffer);
+            }
+        }
        /// <summary>
        /// Copy data from one stream to another, leaving the read position of both streams at the beginning.
        /// </summary>
@@ -1405,7 +1769,7 @@ namespace OpenSim.Framework
            const int readSize = 256;
            byte[] buffer = new byte[readSize];
            MemoryStream ms = new MemoryStream();
-        
            int count = inputStream.Read(buffer, 0, readSize);
            while (count > 0)
@@ -1485,12 +1849,16 @@ namespace OpenSim.Framework
            return new UUID(bytes, 0);
        }
-        public static void ParseFakeParcelID(UUID parcelID, out ulong regionHandle, out uint x, out uint y)
+        public static bool ParseFakeParcelID(UUID parcelID, out ulong regionHandle, out uint x, out uint y)
        {
            byte[] bytes = parcelID.GetBytes();
            regionHandle = Utils.BytesToUInt64(bytes);
            x = Utils.BytesToUInt(bytes, 8) & 0xffff;
            y = Utils.BytesToUInt(bytes, 12) & 0xffff;
+            // validation may fail, just reducing the odds of using a real UUID as encoded parcel
+            return  ( bytes[0] == 0 && bytes[4] == 0 && // handler x,y multiples of 256
+                         bytes[9] < 64 && bytes[13] < 64 && // positions < 16km
+                         bytes[14] == 0 && bytes[15] == 0);
        }
        public static void ParseFakeParcelID(UUID parcelID, out ulong regionHandle, out uint x, out uint y, out uint z)
@@ -1513,7 +1881,7 @@ namespace OpenSim.Framework
            x += rx;
            y += ry;
        }
-        
        /// <summary>
        /// Get operating system information if available.  Returns only the first 45 characters of information
        /// </summary>
@@ -1524,20 +1892,20 @@ namespace OpenSim.Framework
        {
            string os = String.Empty;
-            if (Environment.OSVersion.Platform != PlatformID.Unix)
+//            if (Environment.OSVersion.Platform != PlatformID.Unix)
-            {
+//            {
-                os = Environment.OSVersion.ToString();
+//                os = Environment.OSVersion.ToString();
-            }
+//            }
-            else
+//            else
-            {
+//            {
-                os = ReadEtcIssue();
+//                os = ReadEtcIssue();
-            }
+//            }
-                      
+//
-            if (os.Length > 45)
+//            if (os.Length > 45)
-            {
+//            {
-                os = os.Substring(0, 45);
+//                os = os.Substring(0, 45);
-            }
+//            }
-            
            return os;
        }
@@ -1579,6 +1947,8 @@ namespace OpenSim.Framework
            // hide the password in the connection string
            passPosition = connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase);
+            if (passPosition == -1)
+                return connectionString;
            passPosition = connectionString.IndexOf("=", passPosition);
            if (passPosition < connectionString.Length)
                passPosition += 1;
@@ -1645,7 +2015,7 @@ namespace OpenSim.Framework
        public static Guid GetHashGuid(string data, string salt)
        {
-            byte[] hash = ComputeMD5Hash(data + salt);
+            byte[] hash = ComputeMD5Hash(data + salt, Encoding.Default);
            //string s = BitConverter.ToString(hash);
@@ -1747,7 +2117,7 @@ namespace OpenSim.Framework
                    vol = vcomps[0];
                }
            }
-            
            string[] comps = path.Split(new char[] {Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar}, StringSplitOptions.RemoveEmptyEntries);
            // Glob
@@ -1792,6 +2162,32 @@ namespace OpenSim.Framework
            return found.ToArray();
        }
+        public static string ServerURI(string uri)
+        {
+            if (uri == string.Empty)
+                return string.Empty;
+            // Get rid of eventual slashes at the end
+            uri = uri.TrimEnd('/');
+            IPAddress ipaddr1 = null;
+            string port1 = "";
+            try
+            {
+                ipaddr1 = Util.GetHostFromURL(uri);
+            }
+            catch { }
+            try
+            {
+                port1 = uri.Split(new char[] { ':' })[2];
+            }
+            catch { }
+            // We tried our best to convert the domain names to IP addresses
+            return (ipaddr1 != null) ? "http://" + ipaddr1.ToString() + ":" + port1 : uri;
+        }
        /// <summary>
        /// Convert a string to a byte format suitable for transport in an LLUDP packet.  The output is truncated to 256 bytes if necessary.
        /// </summary>
@@ -1823,14 +2219,14 @@ namespace OpenSim.Framework
            if (!str.EndsWith("\0"))
                str += "\0";
-            
            // Because this is UTF-8 encoding and not ASCII, it's possible we
            // might have gotten an oversized array even after the string trim
            byte[] data = UTF8.GetBytes(str);
-            if (data.Length > 256)
+            if (data.Length > 255) //play safe
            {
-                int cut = 255;
+                int cut = 254;
                if((data[cut] & 0x80 ) != 0 )
                    {
                    while(cut > 0 && (data[cut] & 0xc0) != 0xc0)
@@ -1895,6 +2291,56 @@ namespace OpenSim.Framework
        }
        /// <summary>
+        /// Convert a string to a byte format suitable for transport in an LLUDP packet.  The output is truncated to MaxLength bytes if necessary.
+        /// </summary>
+        /// <param name="str">
+        /// If null or empty, then an bytes[0] is returned.
+        /// Using "\0" will return a conversion of the null character to a byte.  This is not the same as bytes[0]
+        /// </param>
+        /// <param name="args">
+        /// Arguments to substitute into the string via the {} mechanism.
+        /// </param>
+        /// <returns></returns>
+        public static byte[] StringToBytes(string str, int MaxLength, params object[] args)
+        {
+            return StringToBytes1024(string.Format(str, args), MaxLength);
+        }
+        /// <summary>
+        /// Convert a string to a byte format suitable for transport in an LLUDP packet.  The output is truncated to MaxLength bytes if necessary.
+        /// </summary>
+        /// <param name="str">
+        /// If null or empty, then an bytes[0] is returned.
+        /// Using "\0" will return a conversion of the null character to a byte.  This is not the same as bytes[0]
+        /// </param>
+        /// <returns></returns>
+        public static byte[] StringToBytes(string str, int MaxLength)
+        {
+            if (String.IsNullOrEmpty(str))
+                return Utils.EmptyBytes;
+            if (!str.EndsWith("\0"))
+                 str += "\0";
+            // Because this is UTF-8 encoding and not ASCII, it's possible we
+            // might have gotten an oversized array even after the string trim
+            byte[] data = UTF8.GetBytes(str);
+            if (data.Length > MaxLength)
+            {
+                int cut = MaxLength - 1 ;
+                if((data[cut] & 0x80 ) != 0 )
+                    {
+                    while(cut > 0 && (data[cut] & 0xc0) != 0xc0)
+                        cut--;
+                    }
+                Array.Resize<byte>(ref data, cut + 1);
+                data[cut] = 0;
+            }
+            return data;
+        }
+        /// <summary>
        /// Pretty format the hashtable contents to a single line.
        /// </summary>
        /// <remarks>
@@ -2004,7 +2450,7 @@ namespace OpenSim.Framework
            STPStartInfo startInfo = new STPStartInfo();
            startInfo.ThreadPoolName = "Util";
-            startInfo.IdleTimeout = 2000;
+            startInfo.IdleTimeout = 20000;
            startInfo.MaxWorkerThreads = maxThreads;
            startInfo.MinWorkerThreads = minThreads;
@@ -2032,7 +2478,7 @@ namespace OpenSim.Framework
                    throw new NotImplementedException();
            }
        }
-                
        /// <summary>
        /// Additional information about threads in the main thread pool. Used to time how long the
        /// thread has been running, and abort it if it has timed-out.
@@ -2043,14 +2489,15 @@ namespace OpenSim.Framework
            public string StackTrace { get; set; }
            private string context;
            public bool LogThread { get; set; }
-            
            public IWorkItemResult WorkItem { get; set; }
            public Thread Thread { get; set; }
            public bool Running { get; set; }
            public bool Aborted { get; set; }
            private int started;
+            public bool DoTimeout;
-            public ThreadInfo(long threadFuncNum, string context)
+            public ThreadInfo(long threadFuncNum, string context, bool dotimeout = true)
            {
                ThreadFuncNum = threadFuncNum;
                this.context = context;
@@ -2058,6 +2505,7 @@ namespace OpenSim.Framework
                Thread = null;
                Running = false;
                Aborted = false;
+                DoTimeout = dotimeout;
            }
            public void Started()
@@ -2128,7 +2576,7 @@ namespace OpenSim.Framework
            foreach (KeyValuePair<long, ThreadInfo> entry in activeThreads)
            {
                ThreadInfo t = entry.Value;
-                if (t.Running && !t.Aborted && (t.Elapsed() >= THREAD_TIMEOUT))
+                if (t.DoTimeout && t.Running && !t.Aborted && (t.Elapsed() >= THREAD_TIMEOUT))
                {
                    m_log.WarnFormat("Timeout in threadfunc {0} ({1}) {2}", t.ThreadFuncNum, t.Thread.Name, t.GetStackTrace());
                    t.Abort();
@@ -2138,7 +2586,7 @@ namespace OpenSim.Framework
                    // It's possible that the thread won't abort. To make sure the thread pool isn't
                    // depleted, increase the pool size.
-                    m_ThreadPool.MaxThreads++;
+//                    m_ThreadPool.MaxThreads++;
                }
            }
        }
@@ -2148,7 +2596,7 @@ namespace OpenSim.Framework
        public static Dictionary<string, int> GetFireAndForgetCallsMade()
        {
            return new Dictionary<string, int>(m_fireAndForgetCallsMade);
-        }       
+        }
        private static Dictionary<string, int> m_fireAndForgetCallsMade = new Dictionary<string, int>();
@@ -2168,11 +2616,11 @@ namespace OpenSim.Framework
        {
            FireAndForget(callback, obj, null);
        }
-     
-        public static void FireAndForget(System.Threading.WaitCallback callback, object obj, string context)
+        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))
@@ -2185,25 +2633,25 @@ namespace OpenSim.Framework
                else
                    m_fireAndForgetCallsInProgress[context]++;
            }
+*/
            WaitCallback realCallback;
            bool loggingEnabled = LogThreadPool > 0;
-            
            long threadFuncNum = Interlocked.Increment(ref nextThreadFuncNum);
-            ThreadInfo threadInfo = new ThreadInfo(threadFuncNum, context);
+            ThreadInfo threadInfo = new ThreadInfo(threadFuncNum, context, dotimeout);
            if (FireAndForgetMethod == FireAndForgetMethod.RegressionTest)
            {
                // If we're running regression tests, then we want any exceptions to rise up to the test code.
-                realCallback = 
+                realCallback =
-                    o => 
+                    o =>
-                    { 
+                    {
-                        Culture.SetCurrentCulture(); 
+                        Culture.SetCurrentCulture();
-                        callback(o); 
+                        callback(o);
-                        
-                        if (context != null)
+//                        if (context != null)
-                            m_fireAndForgetCallsInProgress[context]--;
+//                            m_fireAndForgetCallsInProgress[context]--;
                    };
            }
            else
@@ -2229,7 +2677,6 @@ namespace OpenSim.Framework
                    }
                    catch (ThreadAbortException e)
                    {
-                        m_log.Error(string.Format("Aborted threadfunc {0} ", threadFuncNum), e);
                    }
                    catch (Exception e)
                    {
@@ -2244,8 +2691,8 @@ namespace OpenSim.Framework
                        if ((loggingEnabled || (threadFuncOverloadMode == 1)) && threadInfo.LogThread)
                            m_log.DebugFormat("Exit threadfunc {0} ({1})", threadFuncNum, FormatDuration(threadInfo.Elapsed()));
-                        if (context != null)
+//                        if (context != null)
-                            m_fireAndForgetCallsInProgress[context]--;
+//                            m_fireAndForgetCallsInProgress[context]--;
                    }
                };
            }
@@ -2253,6 +2700,7 @@ namespace OpenSim.Framework
            long numQueued = Interlocked.Increment(ref numQueuedThreadFuncs);
            try
            {
+/*
                long numRunning = numRunningThreadFuncs;
                if (m_ThreadPool != null && LogOverloads)
@@ -2285,6 +2733,7 @@ namespace OpenSim.Framework
                    }
                }
                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.
@@ -2342,7 +2791,7 @@ namespace OpenSim.Framework
                if (stackTrace.Contains("BeginFireQueueEmpty"))
                    return false;
            }
-            
            return true;
        }
@@ -2355,7 +2804,7 @@ namespace OpenSim.Framework
        {
            string src = Environment.StackTrace;
            string[] lines = src.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
-            
            StringBuilder dest = new StringBuilder(src.Length);
            bool started = false;
@@ -2400,11 +2849,11 @@ namespace OpenSim.Framework
        /// trace. And pausing another thread can cause a deadlock. This method attempts to
        /// avoid deadlock by using a short timeout (200ms), after which it gives up and
        /// returns 'null' instead of the stack trace.
-        /// 
+        ///
        /// Take from: http://stackoverflow.com/a/14935378
-        /// 
+        ///
        /// WARNING: this doesn't work in Mono. See https://bugzilla.novell.com/show_bug.cgi?id=571691
-        /// 
+        ///
        /// </remarks>
        /// <returns>The stack trace, or null if failed to get it</returns>
        private static StackTrace GetStackTrace(Thread targetThread)
@@ -2500,12 +2949,22 @@ namespace OpenSim.Framework
            return stpi;
        }
+        public static void StopThreadPool()
+        {
+            if (m_ThreadPool == null)
+                return;
+            SmartThreadPool pool = m_ThreadPool;
+            m_ThreadPool = null;
+            try { pool.Shutdown(); } catch {}          
+        }
        #endregion FireAndForget Threading Pattern
        /// <summary>
        /// Environment.TickCount is an int but it counts all 32 bits so it goes positive
        /// and negative every 24.9 days. This trims down TickCount so it doesn't wrap
-        /// for the callers. 
+        /// for the callers.
        /// This trims it to a 12 day interval so don't let your frame time get too long.
        /// </summary>
        /// <returns></returns>
@@ -2513,6 +2972,7 @@ namespace OpenSim.Framework
        {
            return Environment.TickCount & EnvironmentTickCountMask;
        }
        const Int32 EnvironmentTickCountMask = 0x3fffffff;
        /// <summary>
@@ -2557,6 +3017,18 @@ namespace OpenSim.Framework
            return tcA - tcB;
        }
+        // returns a timestamp in ms as double
+        // using the time resolution avaiable to StopWatch
+        public static double GetTimeStamp()
+        {
+            return (double)Stopwatch.GetTimestamp() * TimeStampClockPeriod;
+        }
+        public static double GetTimeStampMS()
+        {
+            return (double)Stopwatch.GetTimestamp() * TimeStampClockPeriodMS;
+        }
        /// <summary>
        /// Formats a duration (given in milliseconds).
        /// </summary>
@@ -2855,7 +3327,7 @@ namespace OpenSim.Framework
                if (parts.Length == 2)
                    return CalcUniversalIdentifier(id, agentsURI, parts[0] + " " + parts[1]);
            }
-            
            return CalcUniversalIdentifier(id, agentsURI, firstName + " " + lastName);
        }
@@ -2940,6 +3412,7 @@ namespace OpenSim.Framework
    }
+/*  don't like this code
    public class DoubleQueue<T> where T:class
    {
        private Queue<T> m_lowQueue = new Queue<T>();
@@ -2954,10 +3427,10 @@ namespace OpenSim.Framework
        public virtual int Count
        {
-            get 
+            get
-            { 
+            {
                lock (m_syncRoot)
-                    return m_highQueue.Count + m_lowQueue.Count; 
+                    return m_highQueue.Count + m_lowQueue.Count;
            }
        }
@@ -3051,7 +3524,7 @@ namespace OpenSim.Framework
            }
        }
    }
+*/
    public class BetterRandom
    {
        private const int BufferSize = 1024;  // must be a multiple of 4
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs
index 1b9ec76..fc0fb1a 100644
--- a/OpenSim/Framework/VersionInfo.cs
+++ b/OpenSim/Framework/VersionInfo.cs
@@ -29,9 +29,10 @@ namespace OpenSim
 {
    public class VersionInfo
    {
-        public const string VersionNumber = "0.8.2.1";
+        public const string VersionNumber = "0.9.0.1";
-        private const string IG_BUILD_NUMBER = "1";
+        public const string AssemblyVersionNumber = "0.9.0.*";
-        private const Flavour VERSION_FLAVOUR = Flavour.IG;
+        public const Flavour VERSION_FLAVOUR = Flavour.Release;
        public enum Flavour
        {
@@ -42,26 +43,25 @@ namespace OpenSim
            RC3,
            Release,
            Post_Fixes,
-            Extended,
+            Extended
-            IG
        }
        public static string Version
        {
-            get { return GetVersionString(VersionNumber, IG_BUILD_NUMBER, VERSION_FLAVOUR); }
+            get { return GetVersionString(VersionNumber, VERSION_FLAVOUR); }
        }
-        public static string GetVersionString(string versionNumber, string buildNumber, Flavour flavour)
+        public static string GetVersionString(string versionNumber, Flavour flavour)
        {
-            string versionString = "OpenSim " + versionNumber + " " + flavour + " build " + buildNumber;
+            string versionString = "OpenSim " + versionNumber + " " + flavour;
            return versionString.PadRight(VERSIONINFO_VERSION_LENGTH);
        }
-        public const int VERSIONINFO_VERSION_LENGTH = 39;
+        public const int VERSIONINFO_VERSION_LENGTH = 27;
        /// <value>
        /// This is the external interface version.  It is separate from the OpenSimulator project version.
-        /// 
+        ///
        /// </value>
        /// Commented because it's not used anymore, see below for new
        /// versioning method.
@@ -70,23 +70,23 @@ namespace OpenSim
        /// <summary>
        /// This rules versioning regarding teleports, and compatibility between simulators in that regard.
        /// </summary>
-        /// 
+        ///
        /// <remarks>
        /// The protocol version that we will use for outgoing transfers
-        /// Valid values are 
+        /// Valid values are
-        /// "SIMULATION/0.3" 
+        /// "SIMULATION/0.3"
        ///   - This is the latest, and it supports teleports to variable-sized regions
        ///   - Older versions can teleport to this one, but only if the destination region
        ///     is 256x256
        /// "SIMULATION/0.2"
        ///   - A source simulator which only implements "SIMULATION/0.1" can still teleport here
        ///   - this protocol is more efficient than "SIMULATION/0.1"
-        /// "SIMULATION/0.1" 
+        /// "SIMULATION/0.1"
        ///   - 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.5f;
+        public readonly static float SimulationServiceVersionAcceptedMax = 0.6f;
        public readonly static float SimulationServiceVersionSupportedMin = 0.3f;
-        public readonly static float SimulationServiceVersionSupportedMax = 0.5f;
+        public readonly static float SimulationServiceVersionSupportedMax = 0.6f;
    }
 }
diff --git a/OpenSim/Framework/WearableCacheItem.cs b/OpenSim/Framework/WearableCacheItem.cs
index 1aecf79..427e149 100644
--- a/OpenSim/Framework/WearableCacheItem.cs
+++ b/OpenSim/Framework/WearableCacheItem.cs
@@ -43,13 +43,14 @@ namespace OpenSim.Framework
        public static WearableCacheItem[] GetDefaultCacheItem()
        {
-            int itemmax = 21;
+            int itemmax = AvatarAppearance.TEXTURE_COUNT;
            WearableCacheItem[] retitems = new WearableCacheItem[itemmax];
            for (uint i=0;i<itemmax;i++)
-                retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i + 1};
+                retitems[i] = new WearableCacheItem() {CacheId = UUID.Zero, TextureID = UUID.Zero, TextureIndex = i};
            return retitems;
        }
-        public static WearableCacheItem[] FromOSD(OSD pInput, IImprovedAssetCache dataCache)
+        public static WearableCacheItem[] FromOSD(OSD pInput, IAssetCache dataCache)
        {
            List<WearableCacheItem> ret = new List<WearableCacheItem>();
            if (pInput.Type == OSDType.Array)
@@ -63,7 +64,7 @@ namespace OpenSim.Framework
                                    CacheId = item["cacheid"].AsUUID(),
                                    TextureID = item["textureid"].AsUUID()
                                });
-                    
                    if (dataCache != null && item.ContainsKey("assetdata"))
                    {
                        AssetBase asset = new AssetBase(item["textureid"].AsUUID(),"BakedTexture",(sbyte)AssetType.Texture,UUID.Zero.ToString());
@@ -98,7 +99,8 @@ namespace OpenSim.Framework
            return ret.ToArray();
        }
-        public static OSD ToOSD(WearableCacheItem[] pcacheItems, IImprovedAssetCache dataCache)
+        public static OSD ToOSD(WearableCacheItem[] pcacheItems, IAssetCache dataCache)
        {
            OSDArray arr = new OSDArray();
            foreach (WearableCacheItem item in pcacheItems)
@@ -111,7 +113,8 @@ namespace OpenSim.Framework
                {
                    if (dataCache.Check(item.TextureID.ToString()))
                    {
-                        AssetBase assetItem = dataCache.Get(item.TextureID.ToString());
+                        AssetBase assetItem;
+                        dataCache.Get(item.TextureID.ToString(), out assetItem);
                        if (assetItem != null)
                        {
                            itemmap.Add("assetdata", OSD.FromBinary(assetItem.Data));
@@ -124,6 +127,68 @@ namespace OpenSim.Framework
            }
            return arr;
        }
+        public static OSDArray BakedToOSD(WearableCacheItem[] pcacheItems)
+        {
+            if (pcacheItems.Length < AvatarAppearance.BAKE_INDICES[AvatarAppearance.BAKE_INDICES.Length - 1])
+                return null;
+            OSDArray arr = new OSDArray();
+            for (int i = 0; i < AvatarAppearance.BAKE_INDICES.Length; i++)
+            {
+                int idx = AvatarAppearance.BAKE_INDICES[i];
+                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;
+        }
+        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();
+                    if (idx < 0 || idx > pcache.Length)
+                        continue;
+                    pcache[idx].CacheId = item["cacheid"].AsUUID();
+                    pcache[idx].TextureID = item["textureid"].AsUUID();
+/*
+                    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;
+        }
        public static WearableCacheItem SearchTextureIndex(uint pTextureIndex,WearableCacheItem[] pcacheItems)
        {
            for (int i = 0; i < pcacheItems.Length; i++)
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs
index b180c8a..20d30b5 100644
--- a/OpenSim/Framework/WebUtil.cs
+++ b/OpenSim/Framework/WebUtil.cs
@@ -72,11 +72,6 @@ namespace OpenSim.Framework
        public static int RequestNumber { get; set; }
        /// <summary>
-        /// Control where OSD requests should be serialized per endpoint.
-        /// </summary>
-        public static bool SerializeOSDRequestsPerEndpoint { get; set; }
-        /// <summary>
        /// this is the header field used to communicate the local request id
        /// used for performance and debugging
        /// </summary>
@@ -98,31 +93,6 @@ namespace OpenSim.Framework
        /// </remarks>
        public const int MaxRequestDiagLength = 200;
-        /// <summary>
-        /// Dictionary of end points
-        /// </summary>
-        private static Dictionary<string,object> m_endpointSerializer = new Dictionary<string,object>();
-        private static object EndPointLock(string url)
-        {
-            System.Uri uri = new System.Uri(url);
-            string endpoint = string.Format("{0}:{1}",uri.Host,uri.Port);
-            lock (m_endpointSerializer)
-            {
-                object eplock = null;
-                if (! m_endpointSerializer.TryGetValue(endpoint,out eplock))
-                {
-                    eplock = new object();
-                    m_endpointSerializer.Add(endpoint,eplock);
-                    // m_log.WarnFormat("[WEB UTIL] add a new host to end point serializer {0}",endpoint);
-                }
-                return eplock;
-            }
-        }
        #region JSONRequest
        /// <summary>
@@ -154,21 +124,6 @@ namespace OpenSim.Framework
            return ServiceOSDRequest(url, null, "GET", timeout, false, false);
        }
-        public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout, bool compressed, bool rpc)
-        {
-            if (SerializeOSDRequestsPerEndpoint)
-            {
-                lock (EndPointLock(url))
-                {
-                    return ServiceOSDRequestWorker(url, data, method, timeout, compressed, rpc);
-                }
-            }
-            else
-            {
-                return ServiceOSDRequestWorker(url, data, method, timeout, compressed, rpc);
-            }
-        }
        public static void LogOutgoingDetail(Stream outputStream)
        {
            LogOutgoingDetail("", outputStream);
@@ -222,7 +177,7 @@ namespace OpenSim.Framework
            LogOutgoingDetail(string.Format("RESPONSE {0}: ", reqnum), input);
        }
-        private static OSDMap ServiceOSDRequestWorker(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)
        {
            int reqnum = RequestNumber++;
@@ -233,6 +188,9 @@ namespace OpenSim.Framework
            string errorMessage = "unknown error";
            int tickstart = Util.EnvironmentTickCount();
            int tickdata = 0;
+            int tickcompressdata = 0;
+            int tickJsondata = 0;
+            int compsize = 0;
            string strBuffer = null;
            try
@@ -242,21 +200,23 @@ namespace OpenSim.Framework
                request.Timeout = timeout;
                request.KeepAlive = false;
                request.MaximumAutomaticRedirections = 10;
-                request.ReadWriteTimeout = timeout / 4;
+                request.ReadWriteTimeout = timeout / 2;
                request.Headers[OSHeaderRequestID] = reqnum.ToString();
-                
                // If there is some input, write it into the request
                if (data != null)
                {
                    strBuffer = OSDParser.SerializeJsonString(data);
+                    tickJsondata = Util.EnvironmentTickCountSubtract(tickstart);
                    if (DebugLevel >= 5)
                        LogOutgoingDetail("SEND", reqnum, strBuffer);
                    byte[] buffer = System.Text.Encoding.UTF8.GetBytes(strBuffer);
                    request.ContentType = rpc ? "application/json-rpc" : "application/json";
-                    
                    if (compressed)
                    {
                        request.Headers["X-Content-Encoding"] = "gzip"; // can't set "Content-Encoding" because old OpenSims fail if they get an unrecognized Content-Encoding
@@ -271,19 +231,25 @@ namespace OpenSim.Framework
                                // gets written on the stream upon Dispose()
                            }
                            byte[] buf = ms.ToArray();
+                            tickcompressdata = Util.EnvironmentTickCountSubtract(tickstart);
                            request.ContentLength = buf.Length;   //Count bytes to send
+                            compsize = buf.Length;
                            using (Stream requestStream = request.GetRequestStream())
                                requestStream.Write(buf, 0, (int)buf.Length);
                        }
                    }
                    else
                    {
+                        compsize = buffer.Length;
                        request.ContentLength = buffer.Length;   //Count bytes to send
                        using (Stream requestStream = request.GetRequestStream())
                            requestStream.Write(buffer, 0, buffer.Length);         //Send it
                    }
                }
-                
                // capture how much time was spent writing, this may seem silly
                // but with the number concurrent requests, this often blocks
                tickdata = Util.EnvironmentTickCountSubtract(tickstart);
@@ -314,6 +280,7 @@ namespace OpenSim.Framework
            catch (Exception ex)
            {
                errorMessage = ex.Message;
+                m_log.Debug("[WEB UTIL]: Exception making request: " + ex.ToString());
            }
            finally
            {
@@ -321,8 +288,17 @@ namespace OpenSim.Framework
                if (tickdiff > LongCallTime)
                {
                    m_log.InfoFormat(
-                        "[LOGHTTP]: Slow JSON-RPC request {0} {1} to {2} took {3}ms, {4}ms writing, {5}",
+                        "[WEB UTIL]: Slow ServiceOSD request {0} {1} {2} took {3}ms, {4}ms writing({5} at Json; {6} at comp), {7} bytes ({8} uncomp): {9}",
-                        reqnum, method, url, tickdiff, tickdata,
+                        reqnum,
+                        method,
+                        url,
+                        tickdiff,
+                        tickdata,
+                        tickJsondata,
+                        tickcompressdata,
+                        compsize,
+                        strBuffer != null ? strBuffer.Length : 0,
                        strBuffer != null
                            ? (strBuffer.Length > MaxRequestDiagLength ? strBuffer.Remove(MaxRequestDiagLength) : strBuffer)
                            : "");
@@ -333,7 +309,7 @@ namespace OpenSim.Framework
                        reqnum, tickdiff, tickdata);
                }
            }
-           
            m_log.DebugFormat(
                "[LOGHTTP]: JSON-RPC request {0} {1} to {2} FAILED: {3}", reqnum, method, url, errorMessage);
@@ -357,7 +333,7 @@ namespace OpenSim.Framework
            result["success"] = OSD.FromBoolean(true);
            result["_RawResult"] = OSD.FromString(response);
            result["_Result"] = new OSDMap();
-            
            if (response.Equals("true",System.StringComparison.OrdinalIgnoreCase))
                return result;
@@ -368,7 +344,7 @@ namespace OpenSim.Framework
                return result;
            }
-            try 
+            try
            {
                OSD responseOSD = OSDParser.Deserialize(response);
                if (responseOSD.Type == OSDType.Map)
@@ -382,10 +358,10 @@ namespace OpenSim.Framework
                // don't need to treat this as an error... we're just guessing anyway
 //                m_log.DebugFormat("[WEB UTIL] couldn't decode <{0}>: {1}",response,e.Message);
            }
-            
            return result;
        }
-        
        #endregion JSONRequest
        #region FormRequest
@@ -396,18 +372,10 @@ namespace OpenSim.Framework
        /// </summary>
        public static OSDMap PostToService(string url, NameValueCollection data)
        {
-            return ServiceFormRequest(url,data,10000);
+            return ServiceFormRequest(url,data, 30000);
-        }
-        
-        public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)
-        {
-            lock (EndPointLock(url))
-            {
-                return ServiceFormRequestWorker(url,data,timeout);
-            }
        }
-        private static OSDMap ServiceFormRequestWorker(string url, NameValueCollection data, int timeout)
+        public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)
        {
            int reqnum = RequestNumber++;
            string method = (data != null && data["RequestMethod"] != null) ? data["RequestMethod"] : "unknown";
@@ -415,7 +383,7 @@ namespace OpenSim.Framework
            if (DebugLevel >= 3)
                m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} ServiceForm '{1}' to {2}",
                    reqnum, method, url);
-            
            string errorMessage = "unknown error";
            int tickstart = Util.EnvironmentTickCount();
            int tickdata = 0;
@@ -428,9 +396,9 @@ namespace OpenSim.Framework
                request.Timeout = timeout;
                request.KeepAlive = false;
                request.MaximumAutomaticRedirections = 10;
-                request.ReadWriteTimeout = timeout / 4;
+                request.ReadWriteTimeout = timeout / 2;
                request.Headers[OSHeaderRequestID] = reqnum.ToString();
-                
                if (data != null)
                {
                    queryString = BuildQueryString(data);
@@ -439,7 +407,7 @@ namespace OpenSim.Framework
                        LogOutgoingDetail("SEND", reqnum, queryString);
                    byte[] buffer = System.Text.Encoding.UTF8.GetBytes(queryString);
-                    
                    request.ContentLength = buffer.Length;
                    request.ContentType = "application/x-www-form-urlencoded";
                    using (Stream requestStream = request.GetRequestStream())
@@ -517,7 +485,7 @@ namespace OpenSim.Framework
        }
        #endregion FormRequest
-        
        #region Uri
        /// <summary>
@@ -570,7 +538,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// Appends a query string to a Uri that may or may not have existing 
+        /// Appends a query string to a Uri that may or may not have existing
        /// query parameters
        /// </summary>
        /// <param name="uri">Uri to append the query to</param>
@@ -622,7 +590,7 @@ namespace OpenSim.Framework
        }
        /// <summary>
-        /// 
+        ///
        /// </summary>
        /// <param name="collection"></param>
        /// <param name="key"></param>
@@ -641,12 +609,12 @@ namespace OpenSim.Framework
        #region Stream
        /// <summary>
-        /// Copies the contents of one stream to another, starting at the 
+        /// Copies the contents of one stream to another, starting at the
        /// current position of each stream
        /// </summary>
-        /// <param name="copyFrom">The stream to copy from, at the position 
+        /// <param name="copyFrom">The stream to copy from, at the position
        /// where copying should begin</param>
-        /// <param name="copyTo">The stream to copy to, at the position where 
+        /// <param name="copyTo">The stream to copy to, at the position where
        /// bytes should be written</param>
        /// <param name="maximumBytesToCopy">The maximum bytes to copy</param>
        /// <returns>The total number of bytes copied</returns>
@@ -779,6 +747,20 @@ namespace OpenSim.Framework
            MakeRequest<TRequest, TResponse>(verb, requestUrl, obj, action, maxConnections, null);
        }
+        /// <summary>
+        /// Perform a synchronous REST request.
+        /// </summary>
+        /// <param name="verb"></param>
+        /// <param name="requestUrl"></param>
+        /// <param name="obj"></param>
+        /// <param name="pTimeout">
+        /// Request timeout in seconds.  Timeout.Infinite indicates no timeout.  If 0 is passed then the default HttpWebRequest timeout is used (100 seconds)
+        /// </param>
+        /// <param name="maxConnections"></param>
+        /// <returns>
+        /// The response.  If there was an internal exception or the request timed out,
+        /// then the default(TResponse) is returned.
+        /// </returns>
        public static void MakeRequest<TRequest, TResponse>(string verb,
                string requestUrl, TRequest obj, Action<TResponse> action,
                int maxConnections, IServiceAuth auth)
@@ -791,6 +773,7 @@ namespace OpenSim.Framework
            int tickstart = Util.EnvironmentTickCount();
            int tickdata = 0;
+            int tickdiff = 0;
            Type type = typeof(TRequest);
@@ -873,7 +856,7 @@ namespace OpenSim.Framework
                            // If the server returns a 404, this appears to trigger a System.Net.WebException even though that isn't
                            // documented in MSDN
                            using (WebResponse response = request.EndGetResponse(res2))
-                            {   
+                            {
                                try
                                {
                                    using (Stream respStream = response.GetResponseStream())
@@ -894,7 +877,7 @@ namespace OpenSim.Framework
                                if (e.Response is HttpWebResponse)
                                {
                                    using (HttpWebResponse httpResponse = (HttpWebResponse)e.Response)
-                                    {        
+                                    {
                                        if (httpResponse.StatusCode != HttpStatusCode.NotFound)
                                        {
                                            // We don't appear to be handling any other status codes, so log these feailures to that
@@ -919,7 +902,7 @@ namespace OpenSim.Framework
                                "[ASYNC REQUEST]: Request {0} {1} failed with exception {2}{3}",
                                verb, requestUrl, e.Message, e.StackTrace);
                        }
-        
                        //  m_log.DebugFormat("[ASYNC REQUEST]: Received {0}", deserial.ToString());
                        try
@@ -932,11 +915,11 @@ namespace OpenSim.Framework
                                "[ASYNC REQUEST]: Request {0} {1} callback failed with exception {2}{3}",
                                verb, requestUrl, e.Message, e.StackTrace);
                        }
-        
                    }, null);
                }
-                int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
+                tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
                if (tickdiff > WebUtil.LongCallTime)
                {
                    string originalRequest = null;
@@ -948,8 +931,7 @@ namespace OpenSim.Framework
                        if (originalRequest.Length > WebUtil.MaxRequestDiagLength)
                            originalRequest = originalRequest.Remove(WebUtil.MaxRequestDiagLength);
                    }
+                     m_log.InfoFormat(
-                    m_log.InfoFormat(
                        "[LOGHTTP]: Slow AsynchronousRequestObject request {0} {1} to {2} took {3}ms, {4}ms writing, {5}",
                        reqnum, verb, requestUrl, tickdiff, tickdata,
                        originalRequest);
@@ -957,11 +939,12 @@ namespace OpenSim.Framework
                else if (WebUtil.DebugLevel >= 4)
                {
                    m_log.DebugFormat("[LOGHTTP]: HTTP OUT {0} took {1}ms, {2}ms writing",
                        reqnum, tickdiff, tickdata);
                }
            }
            finally
-            { 
+            {
                if (buffer != null)
                    buffer.Dispose();
            }
@@ -983,7 +966,8 @@ namespace OpenSim.Framework
        ///
        /// <exception cref="System.Net.WebException">Thrown if we encounter a network issue while posting
        /// the request.  You'll want to make sure you deal with this as they're not uncommon</exception>
-        public static string MakeRequest(string verb, string requestUrl, string obj, int timeoutsecs, IServiceAuth auth)
+        public static string MakeRequest(string verb, string requestUrl, string obj, int timeoutsecs = -1,
+                 IServiceAuth auth = null, bool keepalive = true)
        {
            int reqnum = WebUtil.RequestNumber++;
@@ -998,12 +982,16 @@ namespace OpenSim.Framework
            request.Method = verb;
            if (timeoutsecs > 0)
                request.Timeout = timeoutsecs * 1000;
+            if(!keepalive && request is HttpWebRequest)
+                ((HttpWebRequest)request).KeepAlive = false;
            if (auth != null)
                auth.AddAuthorization(request.Headers);
            string respstring = String.Empty;
+            int tickset = Util.EnvironmentTickCountSubtract(tickstart);
            using (MemoryStream buffer = new MemoryStream())
            {
                if ((verb == "POST") || (verb == "PUT"))
@@ -1024,11 +1012,10 @@ namespace OpenSim.Framework
                    if (WebUtil.DebugLevel >= 5)
                        WebUtil.LogOutgoingDetail("SEND", reqnum, System.Text.Encoding.UTF8.GetString(data));
-                    Stream requestStream = null;
                    try
                    {
-                        requestStream = request.GetRequestStream();
+                        using(Stream requestStream = request.GetRequestStream())
-                        requestStream.Write(data, 0, length);
+                            requestStream.Write(data,0,length);
                    }
                    catch (Exception e)
                    {
@@ -1038,9 +1025,6 @@ namespace OpenSim.Framework
                    }
                    finally
                    {
-                        if (requestStream != null)
-                            requestStream.Dispose();
                        // capture how much time was spent writing
                        tickdata = Util.EnvironmentTickCountSubtract(tickstart);
                    }
@@ -1070,8 +1054,13 @@ namespace OpenSim.Framework
            if (tickdiff > WebUtil.LongCallTime)
            {
                m_log.InfoFormat(
-                    "[LOGHTTP]: Slow SynchronousRestForms request {0} {1} to {2} took {3}ms, {4}ms writing, {5}",
+                    "[FORMS]: Slow request {0} {1} {2} took {3}ms, {4}ms writing, {5}",
-                    reqnum, verb, requestUrl, tickdiff, tickdata,
+                    reqnum,
+                    verb,
+                    requestUrl,
+                    tickdiff,
+                    tickset,
+                    tickdata,
                    obj.Length > WebUtil.MaxRequestDiagLength ? obj.Remove(WebUtil.MaxRequestDiagLength) : obj);
            }
            else if (WebUtil.DebugLevel >= 4)
@@ -1086,16 +1075,6 @@ namespace OpenSim.Framework
            return respstring;
        }
-        public static string MakeRequest(string verb, string requestUrl, string obj, int timeoutsecs)
-        {
-            return MakeRequest(verb, requestUrl, obj, timeoutsecs, null);
-        }
-        public static string MakeRequest(string verb, string requestUrl, string obj)
-        {
-            return MakeRequest(verb, requestUrl, obj, -1);
-        }
        public static string MakeRequest(string verb, string requestUrl, string obj, IServiceAuth auth)
        {
            return MakeRequest(verb, requestUrl, obj, -1, auth);
@@ -1136,7 +1115,7 @@ namespace OpenSim.Framework
        /// Request timeout in milliseconds.  Timeout.Infinite indicates no timeout.  If 0 is passed then the default HttpWebRequest timeout is used (100 seconds)
        /// </param>
        /// <returns>
-        /// The response.  If there was an internal exception or the request timed out, 
+        /// The response.  If there was an internal exception or the request timed out,
        /// then the default(TResponse) is returned.
        /// </returns>
        public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout)
@@ -1159,7 +1138,7 @@ namespace OpenSim.Framework
        /// </param>
        /// <param name="maxConnections"></param>
        /// <returns>
-        /// The response.  If there was an internal exception or the request timed out, 
+        /// The response.  If there was an internal exception or the request timed out,
        /// then the default(TResponse) is returned.
        /// </returns>
        public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout, int maxConnections)
@@ -1178,7 +1157,7 @@ namespace OpenSim.Framework
        /// </param>
        /// <param name="maxConnections"></param>
        /// <returns>
-        /// The response.  If there was an internal exception or the request timed out, 
+        /// The response.  If there was an internal exception or the request timed out,
        /// then the default(TResponse) is returned.
        /// </returns>
        public static TResponse MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout, int maxConnections, IServiceAuth auth)
@@ -1202,7 +1181,7 @@ namespace OpenSim.Framework
                auth.AddAuthorization(ht.Headers);
            if (pTimeout != 0)
-                ht.Timeout = pTimeout;
+                request.Timeout = pTimeout;
            if (maxConnections > 0 && ht.ServicePoint.ConnectionLimit < maxConnections)
                ht.ServicePoint.ConnectionLimit = maxConnections;
@@ -1283,18 +1262,24 @@ namespace OpenSim.Framework
                        {
                            if (hwr.StatusCode == HttpStatusCode.NotFound)
                                return deserial;
                            if (hwr.StatusCode == HttpStatusCode.Unauthorized)
                            {
-                                m_log.Error(string.Format(
+                                m_log.ErrorFormat("[SynchronousRestObjectRequester]: Web request {0} requires authentication",
-                                    "[SynchronousRestObjectRequester]: Web request {0} requires authentication ",
+                                    requestUrl);
-                                    requestUrl));
+                            }
-                                return deserial;
+                            else
+                            {
+                                m_log.WarnFormat("[SynchronousRestObjectRequester]: Web request {0} returned error: {1}",
+                                    requestUrl, hwr.StatusCode);
                            }
                        }
                        else
-                            m_log.Error(string.Format(
+                            m_log.ErrorFormat(
-                                "[SynchronousRestObjectRequester]: WebException for {0} {1} {2} ",
+                                "[SynchronousRestObjectRequester]: WebException for {0} {1} {2} {3}",
-                                verb, requestUrl, typeof(TResponse).ToString()), e);
+                                verb, requestUrl, typeof(TResponse).ToString(), e.Message);
+                       return deserial;
                    }
                }
                catch (System.InvalidOperationException)
@@ -1344,7 +1329,6 @@ namespace OpenSim.Framework
            return deserial;
        }
-    
        public static class XMLResponseHelper
        {
            public static TResponse LogAndDeserialize<TRequest, TResponse>(int reqnum, Stream respStream, long contentLength)
@@ -1369,7 +1353,7 @@ namespace OpenSim.Framework
        }
    }
-    
    public static class XMLRPCRequester
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -1413,7 +1397,7 @@ namespace OpenSim.Framework
                {
                    m_log.Error("Error parsing XML-RPC response", e);
                }
-                    
                if (Resp.IsFault)
                {
                    m_log.DebugFormat(